cvs: php4(PHP_4_2_0) /ext/interbase interbase.c php_interbase.h

daniela Thu Jun 6 17:35:39 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/interbase interbase.c php_interbase.h Log: Add control on Ib version. ibase_add_user(), ibase_modify_user() and ibase_delete_user() available with IB6 or later. fix bug #17184 Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.77.2.3 php4/ext/interbase/interbase.c:1.77.2.4 --- php4/ext/interbase/interbase.c:1.77.2.3 Sun May 12 09:01:28 2002 +++ php4/ext/interbase/interbase.c Thu Jun 6 17:35:38 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.77.2.3 2002/05/12 13:01:28 daniela Exp $ */ +/* $Id: interbase.c,v 1.77.2.4 2002/06/06 21:35:38 daniela Exp $ */ /* TODO: Arrays, roles? @@ -103,11 +103,11 @@ 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} }; @@ -603,7 +603,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.77.2.3 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.77.2.4 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif @@ -2959,7 +2959,7 @@ 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 @@ 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 */ Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.25 php4/ext/interbase/php_interbase.h:1.25.2.1 --- php4/ext/interbase/php_interbase.h:1.25 Sun Jan 27 10:31:15 2002 +++ php4/ext/interbase/php_interbase.h Thu Jun 6 17:35:38 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.25 2002/01/27 15:31:15 aeschbacher Exp $ */ +/* $Id: php_interbase.h,v 1.25.2.1 2002/06/06 21:35:38 daniela Exp $ */ #ifndef PHP_INTERBASE_H #define PHP_INTERBASE_H @@ -68,11 +68,11 @@ 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