? src/config/libpsmoduleconfig_la-pmConfig.loT
? src/config/pm
? src/config/pmConfigDB.patch
Index: src/config/pmConfig.c
===================================================================
RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/config/pmConfig.c,v
retrieving revision 1.5
diff -u -r1.5 pmConfig.c
--- src/config/pmConfig.c	12 Dec 2005 20:11:06 -0000	1.5
+++ src/config/pmConfig.c	31 Jan 2006 00:32:51 -0000
@@ -423,6 +423,13 @@
 This is currently NULL.
  *****************************************************************************/
 
+#ifdef OMIT_PSDB
+psDB *pmConfigDB(psMetadata *site)
+{
+    psError(PS_ERR_UNKNOWN, true, "pslib was built without psDB support");
+    return NULL;
+}
+#else
 psDB *pmConfigDB(
     psMetadata *site)
 {
@@ -434,10 +441,23 @@
     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");
-        return(NULL);
+        return NULL;
+    }
+
+    dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
+    psFree(dbServer);
+    psFree(dbUsername);
+    psFree(dbPassword);
+    psFree(dbName);
+
+    if (!dbh) {
+        psError(PS_ERR_UNKNOWN, false, "database connection failed");
     }
 
-    return(psDBInit(dbServer, dbUsername, dbPassword, NULL));
+    return dbh;
 }
+#endif
Index: src/config/pmConfig.h
===================================================================
RCS file: /usr/local/cvs/repositories/pan-starrs/datasys/IPP/psModule/src/config/pmConfig.h,v
retrieving revision 1.2
diff -u -r1.2 pmConfig.h
--- src/config/pmConfig.h	20 Oct 2005 23:06:24 -0000	1.2
+++ src/config/pmConfig.h	31 Jan 2006 00:32:51 -0000
@@ -90,6 +90,10 @@
  * security. (TBD)
  * 
  */
+#ifdef DOMIT_PSDB
+typedef psDB void;
+#endif
+
 psDB *pmConfigDB(
     psMetadata *site
 );