From: Evan Hunt <each@isc.org>
Date: Mon, 16 Nov 2009 04:27:44 +0000 (+0000)
Subject: 2768.	[bug]		dnssec-signzone: -S no longer implies -g [RT #20568]
X-Git-Tag: v9.7.0b3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00295e065080e0b9856d00b15976d1ed5d280cbf;p=thirdparty%2Fbind9.git

2768.	[bug]		dnssec-signzone: -S no longer implies -g [RT #20568]
---

diff --git a/CHANGES b/CHANGES
index 5a38be3bc61..b70114e84be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2768.	[bug]		dnssec-signzone: -S no longer implies -g [RT #20568]
+
 2767.	[bug]		named could crash on startup if a zone was
 			configured with auto-dnssec and there was no
 			key-directory. [RT #20615]
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 0303b4ebffa..5c2deede344 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.252 2009/11/03 01:31:17 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.253 2009/11/16 04:27:44 each Exp $ */
 
 /*! \file */
 
@@ -3129,10 +3129,10 @@ usage(void) {
 	fprintf(stderr, "\t-K directory:\n");
 	fprintf(stderr, "\t\tdirectory to find key files (.)\n");
 	fprintf(stderr, "\t-d directory:\n");
-	fprintf(stderr, "\t\tdirectory to find dsset files (.)\n");
+	fprintf(stderr, "\t\tdirectory to find dsset-* files (.)\n");
 	fprintf(stderr, "\t-g:\t");
-	fprintf(stderr, "generate dsset file, and/or include DS records\n"
-			"\t\tfrom child zones' dsset files\n");
+	fprintf(stderr, "update DS records based on child zones' "
+			"dsset-* files\n");
 	fprintf(stderr, "\t-s [YYYYMMDDHHMMSS|+offset]:\n");
 	fprintf(stderr, "\t\tRRSIG start time - absolute|offset (now - 1 hour)\n");
 	fprintf(stderr, "\t-e [YYYYMMDDHHMMSS|+offset|\"now\"+offset]:\n");
@@ -3453,7 +3453,6 @@ main(int argc, char *argv[]) {
 
 		case 'S':
 			smartsign = ISC_TRUE;
-			generateds = ISC_TRUE;
 			break;
 
 		case 's':