Check username for external authentication and update error text

Author: cjbj

src/dpi/include/dpiException.h

@@ -49,7 +49,7 @@ enum DpiError                          // error type
   DpiErrNoEnv         = 003, // "No OCI environment handle created"
   DpiErrInvalidState  = 004, // "Invalid state while working with timestamp"
   DpiErrUninitialized = 005, // "Uninitialized state while working with timestamp"
-  DpiErrPasswdExtAuth = 006, // "password specified with external authentication"
+  DpiErrExtAuth= 006, // "user and password should not be set when using external authentication"
 };
 
 

src/dpi/src/dpiConnImpl.cpp

@@ -94,8 +94,8 @@ try :  env_(env), pool_(NULL),
 
   if (isExternalAuth)
   {
-    if (password.length())
-      throw ExceptionImpl(DpiErrPasswdExtAuth);
+    if (password.length() || user.length())
+      throw ExceptionImpl(DpiErrExtAuth);
   }
   else
   {

src/dpi/src/dpiExceptionImpl.cpp

@@ -55,7 +55,7 @@ static const char *dpiErrors[] =
   "no OCI environment handle created",                // DpiErrNoEnv
   "invalid state while working with timestamp",       // DpiErrInvalidState
   "uninitialized state while working with timestamp", // DpiErrUninitialized
-  "password specified with external authentication"   // DpiErrPasswdExtAuth
+  "user and password should not be set when using external authentication", // DpiErrExtAuth
 };
 
 

src/dpi/src/dpiPoolImpl.cpp

@@ -95,8 +95,8 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
 
   unsigned char spoolMode = OCI_SPOOL_ATTRVAL_NOWAIT; // spoolMode is a ub1
 
-  if (isExternalAuth && password.length())
-      throw ExceptionImpl(DpiErrPasswdExtAuth);
+  if (isExternalAuth && (password.length() || user.length()))
+      throw ExceptionImpl(DpiErrExtAuth);
 
   ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_, 
                             OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);