davidb/jdnssec-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

for jdnssec-signzone and jdnssec-signrrset, make 'multiline' output NOT the default, and add a command line switch to enable it.

Browse Source 
git-svn-id: https://svn.verisignlabs.com/jdnssec/tools/trunk@240 4cbd57fe-54e5-0310-bd9a-f30fe5ea5e6e
This commit is contained in:
David Blacka 2011-02-09 23:58:51 +00:00
parent 8347e5ffc3
commit 73d930a850
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/verisignlabs/dnssec/cl/SignRRset.java
View File

@ -91,6 +91,7 @@ public class SignRRset {
// boolean options // boolean options
opts.addOption("h", "help", false, "Print this message."); opts.addOption("h", "help", false, "Print this message.");
opts.addOption("a", "verify", false, "verify generated signatures>"); opts.addOption("a", "verify", false, "verify generated signatures>");
opts.addOption("m", "multiline", false, "Use a multiline format");
OptionBuilder.hasOptionalArg(); OptionBuilder.hasOptionalArg();
OptionBuilder.withLongOpt("verbose"); OptionBuilder.withLongOpt("verbose");
@ -169,6 +170,7 @@ public class SignRRset {
} }
if (cli.hasOption('a')) verifySigs = true; if (cli.hasOption('a')) verifySigs = true;
if (cli.hasOption('m')) org.xbill.DNS.Options.set("multiline");
if ((optstr = cli.getOptionValue('D')) != null) { if ((optstr = cli.getOptionValue('D')) != null) {
keyDirectory = new File(optstr); keyDirectory = new File(optstr);
@ -434,8 +436,6 @@ public class SignRRset {
} }
// write out the signed zone // write out the signed zone
// force multiline mode for now
org.xbill.DNS.Options.set("multiline");
ZoneUtils.writeZoneFile(signed_records, state.outputfile); ZoneUtils.writeZoneFile(signed_records, state.outputfile);
if (state.verifySigs) { if (state.verifySigs) {

4
src/com/verisignlabs/dnssec/cl/SignZone.java
View File

@ -113,6 +113,7 @@ public class SignZone
opts.addOption("F", "fully-sign-keyset", false, opts.addOption("F", "fully-sign-keyset", false,
"sign the zone apex keyset with all available keys."); "sign the zone apex keyset with all available keys.");
opts.addOption("V", "verbose-signing", false, "Display verbose signing activity."); opts.addOption("V", "verbose-signing", false, "Display verbose signing activity.");
opts.addOption("m", "multiline", false, "Use a multiline format");
// Argument options // Argument options
OptionBuilder.hasOptionalArg(); OptionBuilder.hasOptionalArg();
@ -256,6 +257,7 @@ public class SignZone
if (cli.hasOption('3')) useNsec3 = true; if (cli.hasOption('3')) useNsec3 = true;
if (cli.hasOption('O')) useOptOut = true; if (cli.hasOption('O')) useOptOut = true;
if (cli.hasOption('V')) verboseSigning = true; if (cli.hasOption('V')) verboseSigning = true;
if (cli.hasOption('m')) org.xbill.DNS.Options.set("multiline");
if (useOptOut && !useNsec3) if (useOptOut && !useNsec3)
{ {
@ -874,8 +876,6 @@ public class SignZone
} }
// write out the signed zone // write out the signed zone
// force multiline mode for now
org.xbill.DNS.Options.set("multiline");
ZoneUtils.writeZoneFile(signed_records, state.outputfile); ZoneUtils.writeZoneFile(signed_records, state.outputfile);
if (state.verifySigs) if (state.verifySigs)