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

diff --git a/NEWS b/NEWS
index b8e9582af761bc030145c10ce5e15923317dc4c1..6d7ae8119a1030e9050a1e639343dae53198667e 100644 (file)
--- 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 d8004eebb655d65c05a6ee7eff8415dccd66e669..e50d12b68ca69c94e32bf951dd56e54276e6cd01 100644 (file)
--- 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 */