From: Antony Dovgal <tony2001@php.net>
Date: Thu, 20 Jan 2005 18:44:10 +0000 (+0000)
Subject: MFH: fix bug #31623 (OCILogin does not support password grace period)
X-Git-Tag: php-4.3.11RC1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4bef7c8a149186790825fc9eb7e253fb0bd3659;p=php

MFH: fix bug #31623 (OCILogin does not support password grace period)
---

diff --git a/NEWS b/NEWS
index b8e9582af7..6d7ae8119a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP 4                                                                      NEWS
 - 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)
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index d8004eebb6..e50d12b68c 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2351,7 +2351,12 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
 
 	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 */