From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 6 Jul 2014 11:49:38 +0000 (+0200)
Subject: remove unused gpgsql-socket option and document postgres socket usage
X-Git-Tag: auth-3.4.0-rc1~104^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba91c2f36579ce388c739f29e915a137eae25563;p=thirdparty%2Fpdns.git

remove unused gpgsql-socket option and document postgres socket usage
---

diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc
index 15502268bc..2a78b906d8 100644
--- a/modules/gpgsqlbackend/gpgsqlbackend.cc
+++ b/modules/gpgsqlbackend/gpgsqlbackend.cc
@@ -18,7 +18,6 @@ gPgSQLBackend::gPgSQLBackend(const string &mode, const string &suffix)  : GSQLBa
     setDB(new SPgSQL(getArg("dbname"),
         	  getArg("host"),
         	  getArg("port"),
-        	  getArg("socket"),
         	  getArg("user"),
         	  getArg("password")));
   }
@@ -41,7 +40,6 @@ public:
     declare(suffix,"user","Pdns backend user to connect as","");
     declare(suffix,"host","Pdns backend host to connect to","");
     declare(suffix,"port","Database backend port to connect to","");
-    declare(suffix,"socket","Pdns backend socket to connect to","");
     declare(suffix,"password","Pdns backend password to connect with","");
 
     declare(suffix,"dnssec","Enable DNSSEC processing","no");
diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 019eba573c..84bff3cccb 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -10,7 +10,7 @@
 
 bool SPgSQL::s_dolog;
 
-SPgSQL::SPgSQL(const string &database, const string &host, const string& port, const string &msocket, const string &user, 
+SPgSQL::SPgSQL(const string &database, const string &host, const string& port, const string &user, 
                const string &password)
 {
   d_db=0;
diff --git a/modules/gpgsqlbackend/spgsql.hh b/modules/gpgsqlbackend/spgsql.hh
index 796a9231f2..1510d3c625 100644
--- a/modules/gpgsqlbackend/spgsql.hh
+++ b/modules/gpgsqlbackend/spgsql.hh
@@ -10,8 +10,7 @@ class SPgSQL : public SSql
 {
 public:
   SPgSQL(const string &database, const string &host="", const string& port="",
-         const string &msocket="",const string &user="", 
-         const string &password="");
+         const string &user="", const string &password="");
 
   ~SPgSQL();
   
diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 05108a7de9..62d0b3128a 100644
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -18653,6 +18653,13 @@ insert into domains (id,name,type) values (domains_id_sequence.nextval,'example.
                   Database host to connect to. WARNING: When specified as a hostname a chicken/egg situation might arise where the database
 		  is needed to resolve the IP address of the database. It is best to supply an IP address of the database here.
                 </para>
+                <para>
+                  Only for postgres:
+                </para>
+                <para>
+                  If host begins with a slash, it specifies Unix-domain communication rather than TCP/IP communication; the value is the name
+                  of the directory in which the socket file is stored.
+                </para>
               </listitem>
             </varlistentry>
             <varlistentry>