Generic Oracle Backend does not have a dbname, host or port - replace it by goracle...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@342 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc
index 5d4fbeb482b597dae6fc6f7b3a8ec24ba7b70e0d..b0a20ed26aa0d5197b9ee30c993524f74c4946d0 100644 (file)
--- a/modules/goraclebackend/goraclebackend.cc
+++ b/modules/goraclebackend/goraclebackend.cc
@@ -21,10 +21,7 @@ using namespace std;
 gOracleBackend::gOracleBackend(const string &mode, const string &suffix)  : GSQLBackend(mode,suffix)
 {
   try {
-    setDB(new SOracle(getArg("dbname"),
-                    getArg("host"),
-                    getArgAsNum("port"),
-                    getArg("socket"),
+    setDB(new SOracle(getArg("tnsname"),
                     getArg("user"),
                     getArg("password")));
     
@@ -44,11 +41,8 @@ public:
   
   void declareArguments(const string &suffix="")
   {
-    declare(suffix,"dbname","Pdns backend database name to connect to","powerdns");
+    declare(suffix,"tnsname","Generic Oracle backend TNSNAME to connect to","powerdns");
     declare(suffix,"user","Database backend user to connect as","powerdns");
-    declare(suffix,"host","Database backend host to connect to","");
-    declare(suffix,"port","Database backend port to connect to","0");
-    declare(suffix,"socket","Pdns backend socket to connect to","");
     declare(suffix,"password","Pdns backend password to connect with","");
 
     declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'");

diff --git a/modules/goraclebackend/soracle.cc b/modules/goraclebackend/soracle.cc
index 2dd0f48c674d42c2463db9df3d2d591c77d98f76..68ef2d57a4f2906f76ad61a49a2f875f27babc67 100644 (file)
--- a/modules/goraclebackend/soracle.cc
+++ b/modules/goraclebackend/soracle.cc
@@ -38,8 +38,8 @@ string SOracle::getOracleError()
   return mReason;
 }
 
-SOracle::SOracle(const string &database, const string &host, u_int16_t port, 
-                const string &msocket, const string &user, 
+SOracle::SOracle(const string &database, 
+                const string &user, 
                 const string &password)
 {
    d_environmentHandle = NULL;

diff --git a/modules/goraclebackend/soracle.hh b/modules/goraclebackend/soracle.hh
index a0ff5da208fa41a989bac12c5f4563eab0b2d729..b20028521dd397e98dc09c70c38a56d1b8b43cd3 100644 (file)
--- a/modules/goraclebackend/soracle.hh
+++ b/modules/goraclebackend/soracle.hh
@@ -11,8 +11,8 @@
 class SOracle : public SSql
 {
 public:
-  SOracle(const string &database, const string &host="", u_int16_t port=0,
-         const string &msocket="",const string &user="", 
+  SOracle(const string &database, 
+         const string &user="", 
          const string &password="");
   
   ~SOracle();

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index 24753a5b8e829bdc67392db1ab9f8d9919c998ec..ec8b5c049069096a4bdd466e307eee0873fa3a82 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -7419,6 +7419,11 @@ create table supermasters (
 insert into domains (id,name,type) values (domains_id_sequence.nextval,'netherlabs.nl','NATIVE');
            </screen>
          </para>
+         <para>
+         Furthermore, use the <command>goracle-tnsname</command> setting to specify which TNSNAME the Generic Oracle Backend
+         should be connectiong to. There are no <command>goracle-dbname</command>, <command>goracle-host</command> or
+          <command>goracle-port</command> settings, their equivalent is in <filename>/etc/tnsnames.ora</filename>.
+         </para>
       </sect2>
 
       <sect2><title>Basic functionality</title>