diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2003-11-18 14:14:09 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2003-11-18 14:14:09 +0000 |
| commit | a3684c7a7fae3c0a0ad3d9641d29affc2b8aed03 (patch) | |
| tree | bd1bf1ed050890b02d624a1468c39c2822f5ce45 /usr.sbin/bind/bin/rndc/rndc-confgen.c | |
| parent | 2177e8980dbcbd0b8006b290bb9de8e8565df3ba (diff) | |
update to BIND v9.2.3. ok todd@
Diffstat (limited to 'usr.sbin/bind/bin/rndc/rndc-confgen.c')
| -rw-r--r-- | usr.sbin/bind/bin/rndc/rndc-confgen.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/bind/bin/rndc/rndc-confgen.c b/usr.sbin/bind/bin/rndc/rndc-confgen.c index 5ac27f03d13..383414009d3 100644 --- a/usr.sbin/bind/bin/rndc/rndc-confgen.c +++ b/usr.sbin/bind/bin/rndc/rndc-confgen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Internet Software Consortium. + * Copyright (C) 2001, 2003 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: rndc-confgen.c,v 1.9.2.4 2001/11/30 01:10:09 gson Exp $ */ +/* $ISC: rndc-confgen.c,v 1.9.2.6 2003/07/22 04:03:37 marka Exp $ */ #include <config.h> @@ -269,11 +269,8 @@ 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); - goto cleanup; - } + if (buf == NULL) + fatal("isc_mem_get(%d) failed\n", len); snprintf(buf, len, "%s/%s", chrootdir, keyfile); write_key_file(buf, user, keyname, &key_txtbuffer); @@ -315,7 +312,6 @@ options {\n\ serveraddr, port, serveraddr, keyname); } - cleanup: if (show_final_mem) isc_mem_stats(mctx, stderr); |