ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Remove genrandom command and all usage of specific random files throughout the system test suite

Browse Source
This commit is contained in:
Ondřej Surý
2018-04-24 16:01:23 +02:00
committed by Witold Kręcicki
parent 3a4f820d62
commit 2b8fab6828
142 changed files with 687 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/python/dnssec-keymgr.docbook
View File

@@ -49,7 +49,6 @@
<arg choice="opt" rep="norepeat"><option>-v</option></arg>
<arg choice="opt" rep="norepeat"><option>-z</option></arg>
<arg choice="opt" rep="norepeat"><option>-g <replaceable class="parameter">path</replaceable></option></arg>
<arg choice="opt" rep="norepeat"><option>-r <replaceable class="parameter">path</replaceable></option></arg>
<arg choice="opt" rep="norepeat"><option>-s <replaceable class="parameter">path</replaceable></option></arg>
<arg choice="opt" rep="repeat">zone</arg>
</cmdsynopsis>
@@ -187,18 +186,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>-r <replaceable class="parameter">randomdev</replaceable></term>
<listitem>
<para>
Specifies a path to a file containing random data.
This is passed to the <command>dnssec-keygen</command> binary
using its <option>-r</option> option.
<!-- TODO: what to do about "-r keyboard"? -->
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-s <replaceable class="parameter">settime-path</replaceable></term>
<listitem>

5
bin/python/isc/keymgr.py.in
View File

@@ -76,7 +76,7 @@ def parse_args():
help='Path to \'dnssec-keygen\'',
metavar='path')
parser.add_argument('-r', dest='randomdev', type=str, default=None,
help='Path to a file containing random data to pass to \'dnssec-keygen\'',
help='DEPRECATED',
metavar='path')
parser.add_argument('-s', dest='settime', default=settime, type=str,
help='Path to \'dnssec-settime\'',
@@ -97,6 +97,9 @@ def parse_args():
args = parser.parse_args()
if args.randomdev:
fatal("ERROR: -r option has been deprecated.")
if args.no_zsk and args.no_ksk:
fatal("ERROR: -z and -k cannot be used together.")