tony2001                Thu Jan 20 13:44:11 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/oci8   oci8.c 
  Log:
  MFH: fix bug #31623 (OCILogin does not support password grace period)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.811&r2=1.1247.2.812&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.811 php-src/NEWS:1.1247.2.812
--- php-src/NEWS:1.1247.2.811   Thu Jan 20 12:57:40 2005
+++ php-src/NEWS        Thu Jan 20 13:44:09 2005
@@ -5,6 +5,8 @@
 - Changed phpize not to require automake and libtool. (Jani)
 - Fixed build system to always use bundled libtool files. (Jani)  
 - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31623 (OCILogin does not support password grace period).
+  (daniel dot beet at accuratesoftware dot com, Tony)
 - Fixed bug #31580 (fgetcsv() problematic with "" escape sequences). (Ilia)
 - Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
 - Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen). 
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.16&r2=1.183.2.17&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.16 php-src/ext/oci8/oci8.c:1.183.2.17
--- php-src/ext/oci8/oci8.c:1.183.2.16  Wed Nov  3 08:35:56 2004
+++ php-src/ext/oci8/oci8.c     Thu Jan 20 13:44:10 2005
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: oci8.c,v 1.183.2.16 2004/11/03 13:35:56 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.17 2005/01/20 18:44:10 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -641,7 +641,7 @@
 
        php_info_print_table_start();
        php_info_print_table_row(2, "OCI8 Support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.16 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.17 $");
 #ifndef PHP_WIN32
        php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
        php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -2351,7 +2351,12 @@
 
        if (OCI(error) != OCI_SUCCESS) {
                oci_error(OCI(pError), "OCISessionBegin", OCI(error));
-               goto CLEANUP;
+               /* OCISessionBegin returns OCI_SUCCESS_WITH_INFO when
+                * user's password has expired, but is still usable.
+                * */
+               if (OCI(error) != OCI_SUCCESS_WITH_INFO) {
+                       goto CLEANUP;
+               }
        }
 
        /* Free Temporary Service Context */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to