Changeset 6067

Timestamp:

Jan 19, 2006, 5:54:44 PM (21 years ago)

Author:

Paul Price

Message:

Applying patch from Josh to fix pmConfigDB

File:

• branches/eam_rel9_p0/psModules/src/config/pmConfig.c (modified) (3 diffs)

branches/eam_rel9_p0/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.5.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-12-31 04:34:18 $
+ *  @version $Revision: 1.5.4.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-20 03:54:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -440 +440 @@
     psBool mdStatus03 = false;
 
+    // XXX leaky strings
     psString dbServer = psMetadataLookupStr(&mdStatus01, site, "DBSERVER");
     psString dbUsername = psMetadataLookupStr(&mdStatus02, site, "DBUSER");
     psString dbPassword = psMetadataLookupStr(&mdStatus03, site, "DBPASSWORD");
+    psString dbName = psMetadataLookupStr(&mdStatus01, site, "DBNAME");
     if (!(mdStatus01 & mdStatus02 & mdStatus03)) {
         psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");
@@ -448 +450 @@
     }
 
-    return(psDBInit(dbServer, dbUsername, dbPassword, NULL));
-}
+    return(psDBInit(dbServer, dbUsername, dbPassword, dbName));
+}