From: Antony Dovgal <tony2001@php.net>
Date: Sun, 13 Feb 2005 00:57:48 +0000 (+0000)
Subject: set username && password only if they were specified
X-Git-Tag: RELEASE_0_2_3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=175bf7e9a3cd3477915006052fe6f924880e2ec9;p=php

set username && password only if they were specified
---

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index cd3fc0de88..6c8cb80673 100755
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -440,21 +440,25 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC
 	}
 
 	/* username */
-	H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
-		   	dbh->username, strlen(dbh->username),
-			OCI_ATTR_USERNAME, H->err);
-	if (H->last_err) {
-		oci_drv_error("OCIAttrSet: OCI_ATTR_USERNAME");
-		goto cleanup;
+	if (dbh->username) {
+		H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
+			   	dbh->username, strlen(dbh->username),
+				OCI_ATTR_USERNAME, H->err);
+		if (H->last_err) {
+			oci_drv_error("OCIAttrSet: OCI_ATTR_USERNAME");
+			goto cleanup;
+		}
 	}
 
 	/* password */
-	H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
-		   	dbh->password, strlen(dbh->password),
-			OCI_ATTR_PASSWORD, H->err);
-	if (H->last_err) {
-		oci_drv_error("OCIAttrSet: OCI_ATTR_PASSWORD");
-		goto cleanup;
+	if (dbh->password) {
+		H->last_err = OCIAttrSet(H->session, OCI_HTYPE_SESSION,
+			   	dbh->password, strlen(dbh->password),
+				OCI_ATTR_PASSWORD, H->err);
+		if (H->last_err) {
+			oci_drv_error("OCIAttrSet: OCI_ATTR_PASSWORD");
+			goto cleanup;
+		}
 	}
 
 	/* Now fire up the session */