From: Stefan Bühler <stbuehler@web.de>
Date: Sat, 13 Jul 2013 10:36:04 +0000 (+0200)
Subject: gpsqlbackend: don't append empty dbname=/user= values to connect string
X-Git-Tag: rec-3.6.0-rc1~561^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf4afdc218ee14ec9c0913f189ceee332db42895;p=thirdparty%2Fpdns.git

gpsqlbackend: don't append empty dbname=/user= values to connect string
---

diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 5e11f1e83f..019eba573c 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -14,11 +14,13 @@ SPgSQL::SPgSQL(const string &database, const string &host, const string& port, c
                const string &password)
 {
   d_db=0;
+  d_connectstr="";
 
-  d_connectstr="dbname=";
-  d_connectstr+=database;
-  d_connectstr+=" user=";
-  d_connectstr+=user;
+  if (!database.empty())
+    d_connectstr+="dbname="+database;
+
+  if (!user.empty())
+    d_connectstr+=" user="+user;
 
   if(!host.empty())
     d_connectstr+=" host="+host;