Changeset 208

Timestamp:

12/19/11 17:25:28 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Drop duplicated SOA-default-loading from initGlobals(), since
that data is loaded in loadConfig().

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -296 +296 @@
   my $dbh = shift;
 
-# load system-wide site defaults and things from config file
-  if (open SYSDEFAULTS, "</etc/dnsdb.conf") {
-##fixme - error check!
-    while (<SYSDEFAULTS>) {
-      next if /^\s*#/;
-      $def{contact}     = $1 if /contact ?= ?([a-z0-9_.-]+)/i;
-      $def{prins}               = $1 if /prins ?= ?([a-z0-9_.-]+)/i;
-      $def{soattl}      = $1 if /soattl ?= ?([a-z0-9_.-]+)/i;
-      $def{refresh}     = $1 if /refresh ?= ?([a-z0-9_.-]+)/i;
-      $def{retry}               = $1 if /retry ?= ?([a-z0-9_.-]+)/i;
-      $def{expire}      = $1 if /expire ?= ?([a-z0-9_.-]+)/i;
-      $def{minttl}      = $1 if /minttl ?= ?([a-z0-9_.-]+)/i;
-      $def{ttl}         = $1 if /ttl ?= ?([a-z0-9_.-]+)/i;
-##fixme?  load DB user/pass from config file?
-    }
-  }
-# load from database
+# load record types from database
   my $sth = $dbh->prepare("select val,name from rectypes");
   $sth->execute;