Updated root.cache

[nsc-5.git] / bin / convert

diff --git a/bin/convert b/bin/convert
index fb9d8530faa0db08c619be2c77bf31ea6a8095a8..4e3d7b3ac4925a86df11b1b949efad9efe0e0ed1 100755 (executable)
--- a/bin/convert
+++ b/bin/convert
@@ -2,16 +2,14 @@
 #
 #      Convert -- A Tool for Conversion of Zone Files to NSC Format
 #
 #
 #      Convert -- A Tool for Conversion of Zone Files to NSC Format
 #

-#      (c) 1999 Martin Mares <mj@ucw.cz>
+#      (c) 1999--2003 Martin Mares <mj@ucw.cz>

 #
 
 #
 

-use lib "/home/mj/perl/lib/site_perl";
-

 use Getopt::Std;
 use Net::DNS::Resolver;
 
 use Getopt::Std;
 use Net::DNS::Resolver;
 

-getopts('v', \%opts) && @ARGV == 1 || do {
-       print "Usage: convert [-v] <domain>\n";
+getopts('v', \%opts) && @ARGV == 2 || do {
+       print "Usage: convert [-v] <domain> <server>\n";

        exit 1;
 };
 $domain = norm_name($ARGV[0]);
        exit 1;
 };
 $domain = norm_name($ARGV[0]);


@@ -19,12 +17,13 @@ $domain = norm_name($ARGV[0]);
 $verbose = $opts{"v"};
 
 $res = new Net::DNS::Resolver;
 $verbose = $opts{"v"};
 
 $res = new Net::DNS::Resolver;

+$res->nameservers($ARGV[1]);

 $res->defnames(0);
 $res->dnsrch(0);
 $res->debug(0);
 
 $verbose && print "; Fetching zone data for $domain\n";
 $res->defnames(0);
 $res->dnsrch(0);
 $res->debug(0);
 
 $verbose && print "; Fetching zone data for $domain\n";

-@zone = $res->axfr($domain) or failed("Zone transfer failed");
+@zone = $res->axfr($domain) or die("Zone transfer failed");

 foreach $r (@zone) {
        if ($verbose) {
                $name = $r->string;
 foreach $r (@zone) {
        if ($verbose) {
                $name = $r->string;


@@ -70,9 +69,9 @@ sub go {
        my $flag = shift @_;
 
        if (defined $ips{$n}) { print "H($n$ips{$n})\n"; }
        my $flag = shift @_;
 
        if (defined $ips{$n}) { print "H($n$ips{$n})\n"; }

-       elsif ($flag) { print "HH($n)\n"; }
+       elsif ($flag) { print "H($n)\n"; }

        if (defined $mx{$n}) { print "MX($mx{$n})\n"; }
        if (defined $mx{$n}) { print "MX($mx{$n})\n"; }

-       if (defined $cn{$n}) { print "CNAME($cn{$n})\n"; }
+       if (defined $cn{$n}) { print "ALIAS($cn{$n})\n"; }

 }
 
 sub norm_name {
 }
 
 sub norm_name {