Allow changing configuration with tincctl without the "config" keyword.

This saves typing some characters, and forces one to be more explicit about the
desired command (get, set).

diff --git a/doc/tincctl.8.in b/doc/tincctl.8.in
index e5301166ed1822b65c892671dff05b094a9922ad..335b3e1b5df15fc4868db121d434d3db3a203048 100644 (file)
--- a/doc/tincctl.8.in
+++ b/doc/tincctl.8.in
@@ -51,12 +51,12 @@ Create initial configuration files and RSA and ECDSA keypairs with default lengt
 If no
 .Ar name
 for this node is given, it will be asked for.
-.It config Oo get Oc Ar variable
+.It get Ar variable
 Print the current value of configuration variable
 .Ar variable .
 If more than one variable with the same name exists,
 the value of each of them will be printed on a separate line.
-.It config Oo set Oc Ar variable Ar value
+.It set Ar variable Ar value
 Set configuration variable
 .Ar variable
 to the given
@@ -64,9 +64,9 @@ to the given
 All previously existing configuration variables with the same name are removed.
 To set a variable for a specific host, use the notation
 .Ar host Ns Li . Ns Ar variable .
-.It config add Ar variable Ar value
+.It add Ar variable Ar value
 As above, but without removing any previously existing configuration variables.
-.It config del Ar variable Op Ar value
+.It del Ar variable Op Ar value
 Remove configuration variables with the same name and
 .Ar value .
 If no
@@ -191,9 +191,9 @@ Example of configuring tinc using
 .Nm :
 .Bd -literal -offset indent
 tincctl -n vpn init foo
-tincctl -n vpn config Subnet 192.168.1.0/24
-tincctl -n vpn config bar.Address bar.example.com
-tincctl -n vpn config ConnectTo bar
+tincctl -n vpn add Subnet 192.168.1.0/24
+tincctl -n vpn add bar.Address bar.example.com
+tincctl -n vpn add ConnectTo bar
 tincctl -n vpn export | gpg --clearsign | mail -s "My config" vpnmaster@example.com
 .Ed
 .Sh TOP

diff --git a/src/tincctl.c b/src/tincctl.c
index ea96fa1740d6ba2e0f7940cacbdb090c4805c86a..be0aa9d984238a0af49baed0dbb1e54862f5fa83 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -112,11 +112,10 @@ static void usage(bool status) {
                                "\n"
                                "Valid commands are:\n"
                                "  init [name]                Create initial configuration files.\n"
-                               "  config                     Change configuration:\n"
-                               "    [get] VARIABLE           - print current value of VARIABLE\n"
-                               "    [set] VARIABLE VALUE     - set VARIABLE to VALUE\n"
-                               "    add VARIABLE VALUE       - add VARIABLE with the given VALUE\n"
-                               "    del VARIABLE [VALUE]     - remove VARIABLE [only ones with watching VALUE]\n"
+                               "  get VARIABLE               Print current value of VARIABLE\n"
+                               "  set VARIABLE VALUE         Set VARIABLE to VALUE\n"
+                               "  add VARIABLE VALUE         Add VARIABLE with the given VALUE\n"
+                               "  del VARIABLE [VALUE]       Remove VARIABLE [only ones with watching VALUE]\n"
                                "  start [tincd options]      Start tincd.\n"
                                "  stop                       Stop tincd.\n"
                                "  restart                    Restart tincd.\n"
@@ -1311,6 +1310,9 @@ static int cmd_config(int argc, char *argv[]) {
                return 1;
        }
 
+       if(strcasecmp(argv[0], "config"))
+               argv--, argc++;
+
        int action = -2;
        if(!strcasecmp(argv[1], "get")) {
                argv++, argc--;
@@ -1988,6 +1990,12 @@ static const struct {
        {"log", cmd_log},
        {"pid", cmd_pid},
        {"config", cmd_config},
+       {"add", cmd_config},
+       {"del", cmd_config},
+       {"get", cmd_config},
+       {"set", cmd_config},
+       {"change", cmd_config},
+       {"replace", cmd_config},
        {"init", cmd_init},
        {"generate-keys", cmd_generate_keys},
        {"generate-rsa-keys", cmd_generate_rsa_keys},