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

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

diff --git a/NEWS b/NEWS
index 7e91e7f609..11089f2825 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Changed phpize not to require automake and libtool. (Jani)
 - Fixed build system to always use bundled libtool files. (Jani)
 - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). (Georg)
+- Fixed bug #31623 (OCILogin does not support password grace period).
+  (daniel dot beet at accuratesoftware dot com, Tony)
 - Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
 - Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen). (Ilia)
 - Fixed bug #31454 (session_set_save_handler crashes PHP when supplied 
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 9aeb6cba13..2cf27ff909 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2863,7 +2863,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 */