(no commit message)

[oweals/gnunet.git] / src / datastore / plugin_datastore_postgres.c

diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 9886b1c8bee2e670ae14fc7b89ef3a179a454726..aa92d7620908512e6abbb9050a6cbe92912cdd0f 100644 (file)
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "plugin_datastore.h"
+#include "gnunet_datastore_plugin.h"
 #include <postgresql/libpq-fe.h>
 
 #define DEBUG_POSTGRES GNUNET_NO
@@ -315,22 +315,25 @@ init_connection (struct Plugin *plugin)
                                         "CONFIG",
                                         &conninfo);
   plugin->dbh = PQconnectdb (conninfo == NULL ? "" : conninfo);
-  GNUNET_free_non_null (conninfo);
   if (NULL == plugin->dbh)
     {
       /* FIXME: warn about out-of-memory? */
+      GNUNET_free_non_null (conninfo);
       return GNUNET_SYSERR;
     }
   if (PQstatus (plugin->dbh) != CONNECTION_OK)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
                       "datastore-postgres",
-                      _("Unable to initialize Postgres: %s"),
+                      _("Unable to initialize Postgres with configuration `%s': %s"),
+                      conninfo,
                       PQerrorMessage (plugin->dbh));
       PQfinish (plugin->dbh);
       plugin->dbh = NULL;
+      GNUNET_free_non_null (conninfo);
       return GNUNET_SYSERR;
     }
+  GNUNET_free_non_null (conninfo);
   ret = PQexec (plugin->dbh,
                 "CREATE TABLE gn090 ("
                 "  type INTEGER NOT NULL DEFAULT 0,"