pullup:

1144.   [bug]           rndc-confgen would crash if both the -a and -t
                        options were specified. [RT #2159]

diff --git a/CHANGES b/CHANGES
index c702e8af0ab0de5041bac6e2e1f7102b676bcdf2..9f77df844247af64eae7150cfc0b4c0143bd0e7d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1144.  [bug]           rndc-confgen would crash if both the -a and -t
+                       options were specified. [RT #2159]
+
 1142.  [bug]           dnssec-signzone would fail to delete temporary files
                        in some failure cases. [RT #2144]
 

diff --git a/bin/rndc/rndc-confgen.c b/bin/rndc/rndc-confgen.c
index e4d36e45b92d73754144065dca8c9098cc3ce6f3..29e5ef2d5765619651707b6121d789ce50af75e1 100644 (file)
--- a/bin/rndc/rndc-confgen.c
+++ b/bin/rndc/rndc-confgen.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc-confgen.c,v 1.9.2.2 2001/11/28 01:58:18 marka Exp $ */
+/* $Id: rndc-confgen.c,v 1.9.2.3 2001/11/28 21:51:51 gson Exp $ */
 
 #include <config.h>
 
@@ -280,8 +280,9 @@ main(int argc, char **argv) {
                        char *buf;
                        len = strlen(chrootdir) + strlen(keyfile) + 2;
                        buf = isc_mem_get(mctx, len);
-                       if (buf != NULL) {
-                               fprintf(stderr, "isc_mem_get(%d) failed\n", len);
+                       if (buf == NULL) {
+                               fprintf(stderr, "isc_mem_get(%d) failed\n",
+                                       len);
                                goto cleanup;
                        }
                        snprintf(buf, len, "%s/%s", chrootdir, keyfile);