tony2001 Thu Jan 20 13:39:49 2005 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix bug #31623 (OCILogin does not support password grace period)
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.265&r2=1.266&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.265 php-src/ext/oci8/oci8.c:1.266
--- php-src/ext/oci8/oci8.c:1.265 Mon Nov 22 16:44:42 2004
+++ php-src/ext/oci8/oci8.c Thu Jan 20 13:39:48 2005
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.265 2004/11/22 21:44:42 andi Exp $ */
+/* $Id: oci8.c,v 1.266 2005/01/20 18:39:48 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.265 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.266 $");
sprintf(buf, "%ld", num_persistent);
php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -2863,7 +2863,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
