Changeset 547 for branches/stable/vega-import.pl

Timestamp:

12/11/13 15:45:18 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, 4 of mumble

Includes changes through r492 with a few minor conflicts.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• vega-import.pl (modified) (2 diffs)

branches/stable/vega-import.pl

@@ -29 +29 @@
 use Data::Dumper;
 
-use DNSDB qw(:ALL);
-
-if (!loadConfig()) {
-  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
-}
+use DNSDB;
+
+my $dnsdb = new DNSDB;
 
 my $mode = 'add';
@@ -45 +43 @@
 $mode = $ARGV[0] if $ARGV[0];
 
-my ($newdbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
+my $newdbh = $dnsdb->{dbh};
 $newdbh->{PrintError} = 1;
 $newdbh->{PrintWarn} = 1;
-initGlobals($newdbh);
 
 my %vegatypes = ('S' => 'SOA', 'N' => 'NS', 'A' => 'A', 'T' => 'TXT',