cvs: php4 /ext/mssql php_mssql.c php_mssql.h

fmk Thu May 9 16:37:45 2002 EDT Modified files: /php4/ext/mssql php_mssql.c php_mssql.h Log: Allow the MSSQL extension to use NT authentication Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.80 php4/ext/mssql/php_mssql.c:1.81 --- php4/ext/mssql/php_mssql.c:1.80 Tue Mar 19 18:00:17 2002 +++ php4/ext/mssql/php_mssql.c Thu May 9 16:37:43 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.80 2002/03/19 23:00:17 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.81 2002/05/09 20:37:43 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -136,6 +136,7 @@ STD_PHP_INI_ENTRY_EX("mssql.textlimit", "-1", PHP_INI_ALL, OnUpdateInt, textlimit, zend_mssql_globals, mssql_globals, display_text_size) STD_PHP_INI_ENTRY_EX("mssql.batchsize", "0", PHP_INI_ALL, OnUpdateInt, batchsize, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_BOOLEAN("mssql.datetimeconvert", "1", PHP_INI_ALL, OnUpdateBool, datetimeconvert, zend_mssql_globals, mssql_globals) + STD_PHP_INI_BOOLEAN("mssql.secure_connection", "0", PHP_INI_SYSTEM, OnUpdateBool, secure_connection, zend_mssql_globals, mssql_globals) PHP_INI_END() /* error handler */ @@ -441,11 +442,16 @@ dbprocerrhandle(mssql.login, (DBERRHANDLE_PROC) php_mssql_error_handler); dbprocmsghandle(mssql.login, (DBMSGHANDLE_PROC) php_mssql_message_handler); - if (user) { - DBSETLUSER(mssql.login,user); + if (MS_SQL_G(secure_connection)){ + DBSETLSECURE(mssql.login); } - if (passwd) { - DBSETLPWD(mssql.login,passwd); + else { + if (user) { + DBSETLUSER(mssql.login,user); + } + if (passwd) { + DBSETLPWD(mssql.login,passwd); + } } DBSETLAPP(mssql.login,MS_SQL_G(appname)); mssql.valid = 1; Index: php4/ext/mssql/php_mssql.h diff -u php4/ext/mssql/php_mssql.h:1.20 php4/ext/mssql/php_mssql.h:1.21 --- php4/ext/mssql/php_mssql.h:1.20 Thu Feb 28 03:26:25 2002 +++ php4/ext/mssql/php_mssql.h Thu May 9 16:37:45 2002 @@ -17,7 +17,7 @@ */ -/* $Id: php_mssql.h,v 1.20 2002/02/28 08:26:25 sebastian Exp $ */ +/* $Id: php_mssql.h,v 1.21 2002/05/09 20:37:45 fmk Exp $ */ #ifndef PHP_MSSQL_H #define PHP_MSSQL_H @@ -119,6 +119,7 @@ long textsize, textlimit, batchsize; long datetimeconvert; HashTable *resource_list, *resource_plist; + long secure_connection; ZEND_END_MODULE_GLOBALS(mssql) #define MSSQL_ROWS_BLOCK 128