diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-04-03 09:16:13 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-04-03 09:16:13 +0200 |
| commit | 3d2d198c71a6b844b60fa9ef68801b66bba93361 (patch) | |
| tree | 449359da3696843def0d77a08fab3d39dd4c3d6c /src | |
| parent | cff5145907908702ef2fcadb9a2f7f1be4c496be (diff) | |
| download | knot-3d2d198c71a6b844b60fa9ef68801b66bba93361.tar.gz | |
Imported Upstream version 1.2.0upstream/1.2.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/knot.conf.5 | 2 | ||||
| -rw-r--r-- | src/knot/conf/conf.c | 1 | ||||
| -rw-r--r-- | src/knot/ctl/knotc_main.c | 10 | ||||
| -rw-r--r-- | src/knotc.8 | 2 | ||||
| -rw-r--r-- | src/knotd.8 | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/knot.conf.5 b/src/knot.conf.5 index ccd2960..361bbb1 100644 --- a/src/knot.conf.5 +++ b/src/knot.conf.5 @@ -1,4 +1,4 @@ -.TH "knot.conf" "5" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4" +.TH "knot.conf" "5" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0" .SH "NAME" .LP .B knot.conf diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c index 28d33e0..562fb89 100644 --- a/src/knot/conf/conf.c +++ b/src/knot/conf/conf.c @@ -507,6 +507,7 @@ conf_t *conf_new(const char* path) c->ixfr_fslimit = -1; c->uid = -1; c->gid = -1; + c->rrl_slip = -1; c->build_diffs = 0; /* Disable by default. */ /* ACLs. */ diff --git a/src/knot/ctl/knotc_main.c b/src/knot/ctl/knotc_main.c index 3354cae..dd37ddf 100644 --- a/src/knot/ctl/knotc_main.c +++ b/src/knot/ctl/knotc_main.c @@ -730,6 +730,11 @@ int main(int argc, char **argv) memcpy(ctl_if->key, &r_key, sizeof(knot_key_t)); } } + } else { + if (r_key.name) { + tsig_key_cleanup(ctl_if->key); + ctl_if->key = &r_key; + } } /* Override from command line. */ @@ -742,11 +747,6 @@ int main(int argc, char **argv) } } if (r_port > -1) ctl_if->port = r_port; - if (r_key.name != NULL) { - tsig_key_cleanup(ctl_if->key); - ctl_if->key = &r_key; - } - /* Verbose mode. */ if (has_flag(flags, F_VERBOSE)) { diff --git a/src/knotc.8 b/src/knotc.8 index bf4561f..b043ebe 100644 --- a/src/knotc.8 +++ b/src/knotc.8 @@ -1,4 +1,4 @@ -.TH knotc "8" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4" +.TH knotc "8" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0" .SH NAME .B knotc \- Knot DNS control utility diff --git a/src/knotd.8 b/src/knotd.8 index 3681343..426668c 100644 --- a/src/knotd.8 +++ b/src/knotd.8 @@ -1,4 +1,4 @@ -.TH "knotd" "8" "September 2012" "CZ.NIC Labs" "Knot DNS, version 1.2.0-rc4" +.TH "knotd" "8" "March 2013" "CZ.NIC Labs" "Knot DNS, version 1.2.0" .SH NAME .B knotd \- Knot DNS daemon |