From 73d930a8509cffeb04cef49ccb28564d225eb4df Mon Sep 17 00:00:00 2001
From: David Blacka <davidb@verisign.com>
Date: Wed, 9 Feb 2011 23:58:51 +0000
Subject: [PATCH] for jdnssec-signzone and jdnssec-signrrset, make 'multiline'
 output NOT the default, and add a command line switch to enable it.

git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@240 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e
---
 src/com/verisignlabs/dnssec/cl/SignRRset.java | 4 ++--
 src/com/verisignlabs/dnssec/cl/SignZone.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/verisignlabs/dnssec/cl/SignRRset.java b/src/com/verisignlabs/dnssec/cl/SignRRset.java
index 5966f8c..7835715 100644
--- a/src/com/verisignlabs/dnssec/cl/SignRRset.java
+++ b/src/com/verisignlabs/dnssec/cl/SignRRset.java
@@ -91,6 +91,7 @@ public class SignRRset {
             // boolean options
             opts.addOption("h", "help", false, "Print this message.");
             opts.addOption("a", "verify", false, "verify generated signatures>");
+            opts.addOption("m", "multiline", false, "Use a multiline format");
 
             OptionBuilder.hasOptionalArg();
             OptionBuilder.withLongOpt("verbose");
@@ -169,6 +170,7 @@ public class SignRRset {
             }
 
             if (cli.hasOption('a')) verifySigs = true;
+            if (cli.hasOption('m')) org.xbill.DNS.Options.set("multiline");
 
             if ((optstr = cli.getOptionValue('D')) != null) {
                 keyDirectory = new File(optstr);
@@ -434,8 +436,6 @@ public class SignRRset {
         }
 
         // write out the signed zone
-        // force multiline mode for now
-        org.xbill.DNS.Options.set("multiline");
         ZoneUtils.writeZoneFile(signed_records, state.outputfile);
 
         if (state.verifySigs) {
diff --git a/src/com/verisignlabs/dnssec/cl/SignZone.java b/src/com/verisignlabs/dnssec/cl/SignZone.java
index 43c09ac..ed1f62c 100644
--- a/src/com/verisignlabs/dnssec/cl/SignZone.java
+++ b/src/com/verisignlabs/dnssec/cl/SignZone.java
@@ -113,6 +113,7 @@ public class SignZone
       opts.addOption("F", "fully-sign-keyset", false,
                      "sign the zone apex keyset with all available keys.");
       opts.addOption("V", "verbose-signing", false, "Display verbose signing activity.");
+      opts.addOption("m", "multiline", false, "Use a multiline format");
 
       // Argument options
       OptionBuilder.hasOptionalArg();
@@ -256,6 +257,7 @@ public class SignZone
       if (cli.hasOption('3')) useNsec3 = true;
       if (cli.hasOption('O')) useOptOut = true;
       if (cli.hasOption('V')) verboseSigning = true;
+      if (cli.hasOption('m')) org.xbill.DNS.Options.set("multiline");
 
       if (useOptOut && !useNsec3)
       {
@@ -874,8 +876,6 @@ public class SignZone
     }
 
     // write out the signed zone
-    // force multiline mode for now
-    org.xbill.DNS.Options.set("multiline");
     ZoneUtils.writeZoneFile(signed_records, state.outputfile);
 
     if (state.verifySigs)