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

diff --git a/NEWS b/NEWS
index 7e91e7f6096b74784553546934fd9642455a3f00..11089f28255463f2c929fee0d67c1f9a45735d9f 100644 (file)
--- 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 9aeb6cba13bf682068350f478ceaba135e250f5b..2cf27ff9090e72442aaeb86dfd056be2304744ad 100644 (file)
--- 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 */