pullup:

1142.   [bug]           dnssec-signzone would fail to delete temporary files
                        in some failure cases. [RT #2144]

diff --git a/CHANGES b/CHANGES
index dcf256244a27c2446c02b1db8ad46e4f9733f55d..1e3c41300701c4e7f8e9554b16935d2f44cc7bfc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1142.  [bug]           dnssec-signzone would fail to delete temporary files
+                       in some failure cases. [RT #2144]
+
 1141.  [bug]           When named rejected a control message, it would
                        leak a file descriptor and memory.  It would also
                        fail to respond, causing rndc to hang. [RT #2139]

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index acc60312aca3797c747e7d1f5a1ff488b0781e7f..688890f13e2c0e94c0697cf218f8c1d204c18d5e 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.c,v 1.31.2.1 2001/09/06 00:14:15 gson Exp $ */
+/* $Id: dnssectool.c,v 1.31.2.2 2001/11/27 22:41:49 gson Exp $ */
 
 #include <config.h>
 
@@ -65,11 +65,8 @@ setfatalcallback(fatalcallback_t *callback) {
 
 void
 check_result(isc_result_t result, const char *message) {
-       if (result != ISC_R_SUCCESS) {
-               fprintf(stderr, "%s: %s: %s\n", program, message,
-                       isc_result_totext(result));
-               exit(1);
-       }
+       if (result != ISC_R_SUCCESS)
+               fatal("%s: %s", message, isc_result_totext(result));
 }
 
 void