Add control on Ib version. ibase_add_user(), ibase_modify_user()

and ibase_delete_user() available with IB6 or later.
fix bug #17184

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 918ab1f91003884988de8cd75d6bc36b98d21e12..ee8c5ba951f02f5e9990024a8253309c1368fc1d 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -103,11 +103,11 @@ function_entry ibase_functions[] = {
        PHP_FE(ibase_blob_echo, NULL)
        PHP_FE(ibase_blob_import, NULL)
        PHP_FE(ibase_errmsg, NULL)
-
+#ifdef SQL_DIALECT_V6
        PHP_FE(ibase_add_user, NULL)
        PHP_FE(ibase_modify_user, NULL)
        PHP_FE(ibase_delete_user, NULL)
-
+#endif
        {NULL, NULL, NULL}
 };
 
@@ -2959,7 +2959,7 @@ PHP_FUNCTION(ibase_blob_import)
        RETVAL_STRINGL((char *)&ib_blob, sizeof(ibase_blob_handle), 1);
 }
 /* }}} */
-
+#ifdef SQL_DIALECT_V6
 /* {{{ _php_ibase_user() */
 static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, int operation)
 {
@@ -3114,31 +3114,32 @@ static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, int operation)
        
        RETURN_TRUE;
 }
-
+/* }}} */
 
 /* {{{ proto int ibase_add_user(string server, string dba_user_name, string dba_password, string user_name, string password [, string first_name] [, string middle_name] [, string last_name])
-   Add an user to security database */
+   Add an user to security database (Ib6 or later) */
 PHP_FUNCTION(ibase_add_user)
 {
        _php_ibase_user(INTERNAL_FUNCTION_PARAM_PASSTHRU, isc_action_svc_add_user);
 }
 /* }}} */
 
-
 /* {{{ proto int ibase_modify_user(string server, string dba_user_name, string dba_password, string user_name, string password [, string first_name] [, string middle_name] [, string last_name])
-   Modify an user in security database */
+   Modify an user in security database (IB6 or later) */
 PHP_FUNCTION(ibase_modify_user)
 {
        _php_ibase_user(INTERNAL_FUNCTION_PARAM_PASSTHRU, isc_action_svc_modify_user);
 }
-
+/* }}} */
 
 /* {{{ proto int ibase_delete_user(string server, string dba_user_name, string dba_password, string username)
-   Delete an user from security database */
+   Delete an user from security database (IB6 or later)*/
 PHP_FUNCTION(ibase_delete_user)
 {
        _php_ibase_user(INTERNAL_FUNCTION_PARAM_PASSTHRU, isc_action_svc_delete_user);
 }
+/* }}} */
+#endif /* SQL_DIALECT_V6 */
 
 #endif /* HAVE_IBASE */
 

diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index c0aff5ed9f068921fb6734abcc909b7182bc25d5..8fc07f268a507366162e29e5a355b92c757d6d8e 100644 (file)
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -68,11 +68,11 @@ PHP_FUNCTION(ibase_blob_close);
 PHP_FUNCTION(ibase_blob_echo);
 PHP_FUNCTION(ibase_blob_info);
 PHP_FUNCTION(ibase_blob_import);
-
+#ifdef SQL_DIALECT_V6
 PHP_FUNCTION(ibase_add_user);
 PHP_FUNCTION(ibase_modify_user);
 PHP_FUNCTION(ibase_delete_user);
-
+#endif
 PHP_FUNCTION(ibase_errmsg);
 
 #define IBASE_MSGSIZE 256