pullup:

 362.   [bug]           rndc no longer aborts if the configuration file is
                        missing an options statement. [RT #209]

diff --git a/CHANGES b/CHANGES
index 41e87f01d1b195de4382976408ae6ca207dd7f5a..e534c5462a571867fe28c9bbee35fa9bca105546 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
        --- 9.0.0rc2 released ---
 
+ 362.  [bug]           rndc no longer aborts if the configuration file is
+                       missing an options statement. [RT #209]
+
  354.  [doc]           Man pages for the dnssec tools are now included in
                        the distribution, in doc/man/dnssec.
 

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index e07de3e5041cf4db960d3666050a61a9c4d30d23..32c04c3c197eeda0f86314936dbc91589ec27ad4 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.12.2.5 2000/07/12 01:18:55 gson Exp $ */
+/* $Id: rndc.c,v 1.12.2.6 2000/08/02 20:59:13 gson Exp $ */
 
 /* 
  * Principal Author: DCL
@@ -361,7 +361,7 @@ main(int argc, char **argv) {
 
        (void)dns_c_ndcctx_getoptions(config, &configopts);
 
-       if (servername == NULL)
+       if (servername == NULL && configopts != NULL)
                result = dns_c_ndcopts_getdefserver(configopts, &servername);
 
        if (servername != NULL)
@@ -369,7 +369,7 @@ main(int argc, char **argv) {
        else {
                fprintf(stderr, "%s: no server specified and no default\n",
                        progname);
-               exit (1);
+               exit(1);
        }
 
        /*