From: Mark Andrews <marka@isc.org>
Date: Tue, 28 Sep 2004 07:11:25 +0000 (+0000)
Subject: 1734.   [cleanup]       'rndc-confgen -a -t' remove extra '/' in path.
X-Git-Tag: v9.2.5rc1~28^2~110
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c42ab597c433e2410473b5daef8a70f12263cfc1;p=thirdparty%2Fbind9.git

1734.   [cleanup]       'rndc-confgen -a -t' remove extra '/' in path.
                        [RT #12588]
---

diff --git a/CHANGES b/CHANGES
index 7b2e5c9b9f3..c3561e7f2c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1734.	[cleanup]	'rndc-confgen -a -t' remove extra '/' in path.
+			[RT #12588]
+
 1733.	[placeholder]	rt12658
 
 1732.	[placeholder]	rt12467
diff --git a/bin/rndc/rndc-confgen.c b/bin/rndc/rndc-confgen.c
index 37a6ba8c08a..21f41de7780 100644
--- a/bin/rndc/rndc-confgen.c
+++ b/bin/rndc/rndc-confgen.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc-confgen.c,v 1.18 2004/03/05 04:58:20 marka Exp $ */
+/* $Id: rndc-confgen.c,v 1.19 2004/09/28 07:11:25 marka Exp $ */
 
 #include <config.h>
 
@@ -273,7 +273,8 @@ main(int argc, char **argv) {
 			buf = isc_mem_get(mctx, len);
 			if (buf == NULL)
 				fatal("isc_mem_get(%d) failed\n", len);
-			snprintf(buf, len, "%s/%s", chrootdir, keyfile);
+			snprintf(buf, len, "%s%s%s", chrootdir,
+				 (*keyfile != '/') ? "/" : "", keyfile);
 			
 			write_key_file(buf, user, keyname, &key_txtbuffer);
 			isc_mem_put(mctx, buf, len);