Changeset 2545

Timestamp:

04/01/12 22:43:22 (14 months ago)

Author:

ahu

Message:

after consultation with Gertjan Schoenmaker, export-etc-hosts-suffix has been tweaked slightly, and is now documented too.

Location:

trunk/pdns/pdns

Files:

• docs/pdns.xml (modified) (1 diff)
• reczones.cc (modified) (1 diff)

trunk/pdns/pdns/docs/pdns.xml

@@ -11780 +11780 @@
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>export-etc-hosts-suffix</term>
+            <listitem>
+              <para>
+                If set, all hostnames in the export-etc-hosts file are
+                loaded in canonical form, based on this suffix, unless the
+                name contain a '.', in which case the name is unchanged. 
+                So an entry called 'pc' with
+                export-etc-hosts-suffix='home.com' will lead to the
+                generation of 'pc.home.com' within the recursor.  An entry
+                called 'server1.home' will be stored as 'server1.home',
+                regardless of the export-etc-hosts setting. Available
+                in since 3.4.
+              </para>
+            </listitem>
+          </varlistentry>
 
           <varlistentry>

trunk/pdns/pdns/reczones.cc

@@ -405 +405 @@
         
         for(unsigned int n=1; n < parts.size(); ++n) {
-          makeNameToIPZone(newMap, parts[n], parts[0]);
-          if(!searchSuffix.empty()) {
+          if(searchSuffix.empty() || parts[n].find('.') != string::npos)
+            makeNameToIPZone(newMap, parts[n], parts[0]);
+          else {
             string canonic=toCanonic(searchSuffix, parts[n]);
             if(canonic != parts[n]) {