From 3734f3f1bad4160cdd7563bc4801bca7e82f8abd Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 11 Jul 2000 00:37:58 +0000 Subject: [PATCH] -k flag changed to -y to be compatible with dig and nsupdate. (... since I have to update the ARM anyway ...) --- bin/rndc/rndc.8 | 15 +++++---------- bin/rndc/rndc.c | 14 +++++++------- bin/rndc/rndc.conf.5 | 4 ++-- doc/man/bin/rndc.8 | 15 +++++---------- doc/man/bin/rndc.conf.5 | 4 ++-- doc/man/misc/rndc.conf.5 | 4 ++-- 6 files changed, 23 insertions(+), 33 deletions(-) diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8 index 82778ad5d5..8185edf2a3 100644 --- a/bin/rndc/rndc.8 +++ b/bin/rndc/rndc.8 @@ -13,7 +13,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.\" $Id: rndc.8,v 1.3 2000/07/10 23:04:42 tale Exp $ +.\" $Id: rndc.8,v 1.4 2000/07/11 00:37:57 tale Exp $ .\" .Dd Jun 30, 2000 .Dt RDNC 8 @@ -25,12 +25,12 @@ .Sh SYNOPSIS .Nm rndc .Op Fl c Ar config-file -.Op Fl k Ar key_id .Op Fl M .Op Fl m .Op Fl p Ar port# .Op Fl s Ar server .Op Fl v +.Op Fl y Ar key_id .Ar command .... .Sh DESCRIPTION This command allows the system administrator to control the operation @@ -89,7 +89,7 @@ on the system running the name server instead of BIND 9's default control channel port of 953. .Pp The -.Fl k +.Fl y option identifies the .Ar key_id to use from the configuration file. The @@ -98,7 +98,7 @@ must be known by .Xr named with the same algorithm and secret string in order for control message validation to succeed. If no -.Fl k +.Fl y option is provided, .Nm rndc will first look for a @@ -147,12 +147,7 @@ offers at least as many management capabilities as the old utility. .Pp There is currently no way to provide the shared secret for a key_id -without using the configuration file, and thus the -.Fl c -option is really required in order for -.Nm rndc -to issue validly signed commands to -.Xr named . +without using the configuration file. .Pp Several error messages could be clearer. For example, trying to connect from an address that is not in the list of acceptable addresses diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index fc3e18ac5a..31e3ffae3a 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: rndc.c,v 1.15 2000/07/10 11:38:37 tale Exp $ */ +/* $Id: rndc.c,v 1.16 2000/07/11 00:37:56 tale Exp $ */ /* * Principal Author: DCL @@ -227,7 +227,7 @@ ndc_signalhandler(omapi_object_t *handle, const char *name, va_list ap) { static void usage(void) { fprintf(stderr, "\ -Usage: %s [-c config] [-s server] [-p port] [-k key] command [command ...]\n\ +Usage: %s [-c config] [-s server] [-p port] [-y key] command [command ...]\n\ \n\ command is one of the following for named:\n\ \n\ @@ -285,16 +285,12 @@ main(int argc, char **argv) { else progname = *argv; - while ((ch = isc_commandline_parse(argc, argv, "c:k:Mmp:s:v")) != -1) { + while ((ch = isc_commandline_parse(argc, argv, "c:Mmp:s:vy:")) != -1) { switch (ch) { case 'c': conffile = isc_commandline_argument; break; - case 'k': - keyname = isc_commandline_argument; - break; - case 'M': isc_mem_debugging = ISC_TRUE; break; @@ -323,6 +319,10 @@ main(int argc, char **argv) { verbose = ISC_TRUE; break; + case 'y': + keyname = isc_commandline_argument; + break; + case '?': usage(); exit(1); diff --git a/bin/rndc/rndc.conf.5 b/bin/rndc/rndc.conf.5 index 5d9ac5b0e1..8e37f976bf 100644 --- a/bin/rndc/rndc.conf.5 +++ b/bin/rndc/rndc.conf.5 @@ -13,7 +13,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.\" $Id: rndc.conf.5,v 1.2 2000/07/11 00:23:38 tale Exp $ +.\" $Id: rndc.conf.5,v 1.3 2000/07/11 00:37:58 tale Exp $ .\" .Dd Jun 30, 2000 .Dt RDNC.CONF 5 @@ -69,7 +69,7 @@ is followed by the name of a key which is identified by a .Dv key{} statement. If no -.Fl k +.Fl y option is provided on the .Xr rndc command line, and no diff --git a/doc/man/bin/rndc.8 b/doc/man/bin/rndc.8 index 82778ad5d5..8185edf2a3 100644 --- a/doc/man/bin/rndc.8 +++ b/doc/man/bin/rndc.8 @@ -13,7 +13,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.\" $Id: rndc.8,v 1.3 2000/07/10 23:04:42 tale Exp $ +.\" $Id: rndc.8,v 1.4 2000/07/11 00:37:57 tale Exp $ .\" .Dd Jun 30, 2000 .Dt RDNC 8 @@ -25,12 +25,12 @@ .Sh SYNOPSIS .Nm rndc .Op Fl c Ar config-file -.Op Fl k Ar key_id .Op Fl M .Op Fl m .Op Fl p Ar port# .Op Fl s Ar server .Op Fl v +.Op Fl y Ar key_id .Ar command .... .Sh DESCRIPTION This command allows the system administrator to control the operation @@ -89,7 +89,7 @@ on the system running the name server instead of BIND 9's default control channel port of 953. .Pp The -.Fl k +.Fl y option identifies the .Ar key_id to use from the configuration file. The @@ -98,7 +98,7 @@ must be known by .Xr named with the same algorithm and secret string in order for control message validation to succeed. If no -.Fl k +.Fl y option is provided, .Nm rndc will first look for a @@ -147,12 +147,7 @@ offers at least as many management capabilities as the old utility. .Pp There is currently no way to provide the shared secret for a key_id -without using the configuration file, and thus the -.Fl c -option is really required in order for -.Nm rndc -to issue validly signed commands to -.Xr named . +without using the configuration file. .Pp Several error messages could be clearer. For example, trying to connect from an address that is not in the list of acceptable addresses diff --git a/doc/man/bin/rndc.conf.5 b/doc/man/bin/rndc.conf.5 index 5d9ac5b0e1..8e37f976bf 100644 --- a/doc/man/bin/rndc.conf.5 +++ b/doc/man/bin/rndc.conf.5 @@ -13,7 +13,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.\" $Id: rndc.conf.5,v 1.2 2000/07/11 00:23:38 tale Exp $ +.\" $Id: rndc.conf.5,v 1.3 2000/07/11 00:37:58 tale Exp $ .\" .Dd Jun 30, 2000 .Dt RDNC.CONF 5 @@ -69,7 +69,7 @@ is followed by the name of a key which is identified by a .Dv key{} statement. If no -.Fl k +.Fl y option is provided on the .Xr rndc command line, and no diff --git a/doc/man/misc/rndc.conf.5 b/doc/man/misc/rndc.conf.5 index 5d9ac5b0e1..8e37f976bf 100644 --- a/doc/man/misc/rndc.conf.5 +++ b/doc/man/misc/rndc.conf.5 @@ -13,7 +13,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.\" $Id: rndc.conf.5,v 1.2 2000/07/11 00:23:38 tale Exp $ +.\" $Id: rndc.conf.5,v 1.3 2000/07/11 00:37:58 tale Exp $ .\" .Dd Jun 30, 2000 .Dt RDNC.CONF 5 @@ -69,7 +69,7 @@ is followed by the name of a key which is identified by a .Dv key{} statement. If no -.Fl k +.Fl y option is provided on the .Xr rndc command line, and no