Commit f9c07c78 authored by Evan Hunt's avatar Evan Hunt
Browse files

remove DLV support from dnssec-signzone

parent 3a19e9ea
...@@ -163,8 +163,6 @@ static bool removefile = false; ...@@ -163,8 +163,6 @@ static bool removefile = false;
static bool generateds = false; static bool generateds = false;
static bool ignore_kskflag = false; static bool ignore_kskflag = false;
static bool keyset_kskonly = false; static bool keyset_kskonly = false;
static dns_name_t *dlv = NULL;
static dns_fixedname_t dlv_fixed;
static dns_master_style_t *dsstyle = NULL; static dns_master_style_t *dsstyle = NULL;
static unsigned int serialformat = SOA_SERIAL_KEEP; static unsigned int serialformat = SOA_SERIAL_KEEP;
static unsigned int hash_length = 0; static unsigned int hash_length = 0;
...@@ -2906,7 +2904,6 @@ writeset(const char *prefix, dns_rdatatype_t type) { ...@@ -2906,7 +2904,6 @@ writeset(const char *prefix, dns_rdatatype_t type) {
dns_dbversion_t *dbversion = NULL; dns_dbversion_t *dbversion = NULL;
dns_diff_t diff; dns_diff_t diff;
dns_difftuple_t *tuple = NULL; dns_difftuple_t *tuple = NULL;
dns_fixedname_t fixed;
dns_name_t *name; dns_name_t *name;
dns_rdata_t rdata, ds; dns_rdata_t rdata, ds;
bool have_ksk = false; bool have_ksk = false;
...@@ -2939,18 +2936,7 @@ writeset(const char *prefix, dns_rdatatype_t type) { ...@@ -2939,18 +2936,7 @@ writeset(const char *prefix, dns_rdatatype_t type) {
dns_diff_init(mctx, &diff); dns_diff_init(mctx, &diff);
if (type == dns_rdatatype_dlv) { name = gorigin;
dns_name_t tname;
unsigned int labels;
dns_name_init(&tname, NULL);
name = dns_fixedname_initname(&fixed);
labels = dns_name_countlabels(gorigin);
dns_name_getlabelsequence(gorigin, 0, labels - 1, &tname);
result = dns_name_concatenate(&tname, dlv, name, NULL);
check_result(result, "dns_name_concatenate");
} else
name = gorigin;
for (key = ISC_LIST_HEAD(keylist); for (key = ISC_LIST_HEAD(keylist);
key != NULL; key != NULL;
...@@ -2991,8 +2977,6 @@ writeset(const char *prefix, dns_rdatatype_t type) { ...@@ -2991,8 +2977,6 @@ writeset(const char *prefix, dns_rdatatype_t type) {
DNS_DSDIGEST_SHA256, DNS_DSDIGEST_SHA256,
dsbuf, &ds); dsbuf, &ds);
check_result(result, "dns_ds_buildrdata"); check_result(result, "dns_ds_buildrdata");
if (type == dns_rdatatype_dlv)
ds.type = dns_rdatatype_dlv;
result = dns_difftuple_create(mctx, result = dns_difftuple_create(mctx,
DNS_DIFFOP_ADDRESIGN, DNS_DIFFOP_ADDRESIGN,
name, 0, &ds, &tuple); name, 0, &ds, &tuple);
...@@ -3130,7 +3114,6 @@ usage(void) { ...@@ -3130,7 +3114,6 @@ usage(void) {
"\t\twith older versions of dnssec-signzone -g\n"); "\t\twith older versions of dnssec-signzone -g\n");
fprintf(stderr, "\t-n ncpus (number of cpus present)\n"); fprintf(stderr, "\t-n ncpus (number of cpus present)\n");
fprintf(stderr, "\t-k key_signing_key\n"); fprintf(stderr, "\t-k key_signing_key\n");
fprintf(stderr, "\t-l lookasidezone\n");
fprintf(stderr, "\t-3 NSEC3 salt\n"); fprintf(stderr, "\t-3 NSEC3 salt\n");
fprintf(stderr, "\t-H NSEC3 iterations (10)\n"); fprintf(stderr, "\t-H NSEC3 iterations (10)\n");
fprintf(stderr, "\t-A NSEC3 optout\n"); fprintf(stderr, "\t-A NSEC3 optout\n");
...@@ -3206,8 +3189,6 @@ main(int argc, char *argv[]) { ...@@ -3206,8 +3189,6 @@ main(int argc, char *argv[]) {
int tempfilelen = 0; int tempfilelen = 0;
dns_rdataclass_t rdclass; dns_rdataclass_t rdclass;
isc_task_t **tasks = NULL; isc_task_t **tasks = NULL;
isc_buffer_t b;
int len;
hashlist_t hashlist; hashlist_t hashlist;
bool make_keyset = false; bool make_keyset = false;
bool set_salt = false; bool set_salt = false;
...@@ -3385,14 +3366,7 @@ main(int argc, char *argv[]) { ...@@ -3385,14 +3366,7 @@ main(int argc, char *argv[]) {
break; break;
case 'l': case 'l':
len = strlen(isc_commandline_argument); fatal("-l option (DLV lookaside) is obsolete");
isc_buffer_init(&b, isc_commandline_argument, len);
isc_buffer_add(&b, len);
dlv = dns_fixedname_initname(&dlv_fixed);
result = dns_name_fromtext(dlv, &b, dns_rootname, 0,
NULL);
check_result(result, "dns_name_fromtext(dlv)");
break; break;
case 'M': case 'M':
...@@ -3798,10 +3772,8 @@ main(int argc, char *argv[]) { ...@@ -3798,10 +3772,8 @@ main(int argc, char *argv[]) {
if (!nokeys) { if (!nokeys) {
writeset("dsset-", dns_rdatatype_ds); writeset("dsset-", dns_rdatatype_ds);
if (make_keyset) if (make_keyset) {
writeset("keyset-", dns_rdatatype_dnskey); writeset("keyset-", dns_rdatatype_dnskey);
if (dlv != NULL) {
writeset("dlvset-", dns_rdatatype_dlv);
} }
} }
......
...@@ -224,16 +224,6 @@ ...@@ -224,16 +224,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>-l <replaceable class="parameter">domain</replaceable></term>
<listitem>
<para>
Generate a DLV set in addition to the key (DNSKEY) and DS sets.
The domain is appended to the name of the records.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>-M <replaceable class="parameter">maxttl</replaceable></term> <term>-M <replaceable class="parameter">maxttl</replaceable></term>
<listitem> <listitem>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment