Standards Cleanup and changes to rndc.conf instructions

2001-07-22 05:55:40 +00:00
parent 6ceca14e5e
commit caae0e0b44
5 changed files with 98 additions and 70 deletions
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -15,7 +15,7 @@ Package=<4>

 ###############################################################################

-Project: "bindevt"=..\bin\win32\bindevt\bindevt.dsp - Package Owner=<4>
+Project: "bindevt"=..\lib\win32\bindevt\bindevt.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -258,6 +258,18 @@ Package=<4>

 ###############################################################################

+Project: "rndcconfgen"=..\bin\rndc\win32\confgen.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "signkey"=..\bin\dnssec\win32\signkey.dsp - Package Owner=<4>

 Package=<5>
--- a/win32utils/dnsheadergen.bat
+++ b/win32utils/dnsheadergen.bat
@@ -17,7 +17,7 @@ rem  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 cd ..\lib\dns
 cd win32
-rem nmake -f gen.mak "gen - Win32 Release"
+nmake -f gen.mak CFG="gen - Win32 Release"
 cd ..
 gen -s . -t > include/dns/enumtype.h
 gen -s . -c > include/dns/enumclass.h
--- a/win32utils/makedefs.pl
+++ b/win32utils/makedefs.pl
@@ -1,8 +1,31 @@
+# makeversion.pl
+#
+# Copyright (C) 2001  Internet Software Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $Id: makedefs.pl,v 1.2 2001/07/22 05:55:38 mayer Exp $ 
+#
 # makedefs.pl
 # This script goes through all of the lib header files and creates a .def file for
 # each DLL for Win32. It recurses as necessary through the subdirectories
 #
-# This program was written by PDM. mayer@gis.net 27-Feb-2001.
+# This program should only be run if it is necessary to regenerate
+# the .def files.  Normally these files should be updated by  hand, adding
+# new functions to the end and removing obsolete ones.
+# If you do renerate them you will also need to modify them by hand to
+# to pick up those routines not detected by this program (like openlog).
 #
 # Search String: ^(([_a-z0-9])*( ))*prefix_[_a-z0-9]+_[a-z0-9]+( )*\(
 # List of directories
@@ -18,11 +41,7 @@
@iscccdirlist = ("isccc/include/isccc");
@iscccprefixlist = ("isccc");

-#@omapidirlist = ("omapi/include/omapi");
-#@omapiprefixlist = ("omapi");
-
@dnsdirlist = ("dns/include/dns","dns/sec/dst/include/dst");
-# , "dns/sec/openssl/include/openssl");
@dnsprefixlist = ("dns", "dst");

@lwresdirlist = ("lwres/include/lwres");
@@ -33,43 +52,47 @@
 $ind = 0;
 createoutfile($iscprefixlist[0]);
 foreach $dir (@iscdirlist) {
-   createdeffile($dir, $iscprefixlist[$ind]);
-   $ind++;
+	createdeffile($dir, $iscprefixlist[$ind]);
+	$ind++;
 }
 close OUTDEFFILE;

 $ind = 0;
 createoutfile($isccfgprefixlist[0]);
 foreach $dir (@isccfgdirlist) {
-   createdeffile($dir, $isccfgprefixlist[$ind]);
-   $ind++;
+	createdeffile($dir, $isccfgprefixlist[$ind]);
+	$ind++;
 }
 close OUTDEFFILE;

 $ind = 0;
 createoutfile($dnsprefixlist[0]);
 foreach $dir (@dnsdirlist) {
-   createdeffile($dir, $dnsprefixlist[$ind]);
-   $ind++;
+	createdeffile($dir, $dnsprefixlist[$ind]);
+	$ind++;
 }
 close OUTDEFFILE;

 $ind = 0;
 createoutfile($iscccprefixlist[0]);
 foreach $dir (@iscccdirlist) {
-   createdeffile($dir, $iscccprefixlist[$ind]);
-   $ind++;
+	createdeffile($dir, $iscccprefixlist[$ind]);
+	$ind++;
 }
 close OUTDEFFILE;

 $ind = 0;
 createoutfile($lwresprefixlist[0]);
 foreach $dir (@lwresdirlist) {
-   createdeffile($dir, $lwresprefixlist[$ind]);
-   $ind++;
+	createdeffile($dir, $lwresprefixlist[$ind]);
+	$ind++;
 }
 close OUTDEFFILE;

+exit;
+#
+# Subroutines
+#
 sub createdeffile {
 $xdir = $_[0];

@@ -78,43 +101,36 @@ $xdir = $_[0];
 #
 #^(([_a-z0-9])*( ))*prefix_[_a-z]+_[a-z]+( )*\(
 $prefix = $_[1];
-#$xdir = "$prefix/include/$prefix";
 #$pattern = "\^\( \)\*$prefix\_\[\_a\-z\]\+_\[a\-z\]\+\( \)\*\\\(";
 #$pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*$prefix\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\(";
 $pattern = "\^\(\(\[\_a\-z0\-9\]\)\*\( \)\)\*\(\\*\( \)\+\)\*$prefix\_\[\_a\-z0\-9\]\+_\[a\-z0\-9\]\+\( \)\*\\\(";
-#print "$pattern\n";

 opendir(DIR,$xdir) || die "No Directory: $!";
@files = grep(/\.h$/i, readdir(DIR));
 closedir(DIR);

 foreach $filename (sort @files) {
-#  print "$filename\n";
-
-#
 #
 # Open the file and locate the pattern.
 #
-  open (HFILE, "$xdir/$filename") || die "Can't open file $filename : $!";
+	open (HFILE, "$xdir/$filename") || die "Can't open file $filename : $!";
 #
-#exit;
-
- while (<HFILE>) {
-   if(/$pattern/) {
-	$func = $&;
-	chop($func);
-	$space = rindex($func, " ") + 1;
-	if($space >= 0) {
-	   $func = substr($func, $space, 100); #strip out return values
-	}
-	print OUTDEFFILE "$func\n";
-   }
- }
+	while (<HFILE>) {
+		if(/$pattern/) {
+			$func = $&;
+			chop($func);
+			$space = rindex($func, " ") + 1;
+			if($space >= 0) {
+				#strip out return values
+				$func = substr($func, $space, 100);
+			}
+			print OUTDEFFILE "$func\n";
+		}
+ 	}
 # Set up the Patterns
- close(HFILE);
+ 	close(HFILE);
 }
 }
-exit;

 # This is the routine that applies the changes

--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-# $Id: makeversion.pl,v 1.1 2001/07/20 05:10:29 mayer Exp $ 
+# $Id: makeversion.pl,v 1.2 2001/07/22 05:55:39 mayer Exp $ 

 # This script takes the version information from the version file located at the
 # root of the source tree and the api files in each library directory and writes
@@ -39,14 +39,14 @@ $versionpath = "../$versionfile";
 #
 open (VERSIONFILE, "../version");
 while (<VERSIONFILE>) {
-   chomp;
-   ($data) = split(/\#/);
-   if($data) {
-     ($name, $value) = split(/=/,$data);
-     ($name) = split(/\s+/, $name);
-     ($value) = split(/\s+/, $value);
-     $Versions{$name} = $value;
-   }
+	chomp;
+	($data) = split(/\#/);
+	if($data) {
+		($name, $value) = split(/=/,$data);
+		($name) = split(/\s+/, $name);
+		($value) = split(/\s+/, $value);
+		$Versions{$name} = $value;
+	}
 }
 close(VERSIONFILE);

@@ -93,24 +93,24 @@ print "BIND Version: $Version\n";
 print OUTVERSIONFILE "#define VERSION \"$Version\"\n\n";

 foreach $dir (@dirlist) {
-   $apifile = "../lib/$dir/api";
-   open (APIVERSION, $apifile);
-   while (<APIVERSION>) {
-      chomp;
-      ($data) = split(/\#/);
-      if ($data) {
-         ($name, $value) = split(/=/, $data);
-         $name =~ s/\s+//;
-         $value =~ s/\s+//;
-         $ApiVersions{$name} = $value;
-      }
-   }
+	$apifile = "../lib/$dir/api";
+	open (APIVERSION, $apifile);
+	while (<APIVERSION>) {
+		chomp;
+		($data) = split(/\#/);
+		if ($data) {
+			($name, $value) = split(/=/, $data);
+			$name =~ s/\s+//;
+			$value =~ s/\s+//;
+			 $ApiVersions{$name} = $value;
+		}
+	}

-   print OUTVERSIONFILE "\n#ifdef $LibMacros{$dir}\n";
-   foreach $name (@VersionNames) {
-      print OUTVERSIONFILE "#define $name\t$ApiVersions{$name}\n";
-   }
-   print OUTVERSIONFILE "#endif\n\n";
+	print OUTVERSIONFILE "\n#ifdef $LibMacros{$dir}\n";
+	foreach $name (@VersionNames) {
+		print OUTVERSIONFILE "#define $name\t$ApiVersions{$name}\n";
+	}
+	print OUTVERSIONFILE "#endif\n\n";

 }

--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,8 +1,8 @@
-	Alpha Release of BIND 9.2.0 for Window NT/2000
+	Beta Release of BIND 9.2.0 for Window NT/2000

 Date: 30-Jun-2001.

-  This is the Alpha Release of BIND 9.2.0 for Windows NT/2000. As such
+  This is a Beta Release of BIND 9.2.0 for Windows NT/2000. As such
 it should not be installed on a production system or anywhere that is
 considered critical for Internet access.  The release has not been
 thoroughly tested.  While IPv6 addresses should work, there is no
@@ -29,12 +29,12 @@ keys.
 Windows NT/2000 uses the same rndc program as is used on Unix
 systems.  The rndc.conf file must be configured for your system in
 order to work. You will need to generate a key for this. To do this
-use the dnssec-keygen program. The program will be installed in the
-same directory as named: dns/bin/.  The syntax of the command is:
+use the rndc-confgen program. The program will be installed in the
+same directory as named: dns/bin/.  Use the command this way:

-dnssec-keygen -a hmac-md5 -b 128 -n user rndc 
+rndc-confgen > rndc.conf

-A sample rndc.conf is include in the kit, but is not copied to
+An rndc.conf will be generated in the current but not copied to
 the dns/etc directory where it needs to reside.

 In addition the named.conf file will need to be modified in order