Ticket #678: psmodules-0.9.99-omit_psdb.patch

src/config/pmConfig.c

@@ -423 +423 @@
 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 +441 @@
     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

src/config/pmConfig.h

@@ -90 +90 @@
  * security. (TBD)
  * 
  */
+#ifdef DOMIT_PSDB
+typedef psDB void;
+#endif
+
 psDB *pmConfigDB(
     psMetadata *site
 );