j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Let tincctl ignore tincd options, so they will be passed on.

Browse source
This commit is contained in:
Guus Sliepen 2012-07-15 21:17:10 +02:00
parent 36dee4c539
commit 9be8980a2b
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/tinc.texi
View file

@ -2060,8 +2060,8 @@ If no @var{value} is given, all configuration variables with the same name will
Start an editor for the given configuration file.
You do not need to specify the full path to the file.
@item start
Start @samp{tincd}.
@item start [tincd options]
Start @samp{tincd}, optionally with the given extra options.
@item stop
Stop @samp{tincd}.

5
doc/tincctl.8.in
View file

@ -71,9 +71,10 @@ is given, all configuration variables with the same name will be removed.
.It edit Ar filename
Start an editor for the given configuration file.
You do not need to specify the full path to the file.
.It start
.It start Op tincd options
Start
.Xr tincd 8 .
.Xr tincd 8 ,
optionally with the given extra options.
.It stop
Stop
.Xr tincd 8 .

12
src/tincctl.c
View file

@ -62,10 +62,18 @@ static struct WSAData wsa_state;
static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'},
{"debug", optional_argument, NULL, 0},
{"no-detach", no_argument, NULL, 0},
{"mlock", no_argument, NULL, 0},
{"net", required_argument, NULL, 'n'},
{"help", no_argument, NULL, 1},
{"version", no_argument, NULL, 2},
{"pidfile", required_argument, NULL, 5},
{"logfile", required_argument, NULL, 0},
{"bypass-security", no_argument, NULL, 0},
{"chroot", no_argument, NULL, 0},
{"user", required_argument, NULL, 0},
{"option", required_argument, NULL, 0},
{NULL, 0, NULL, 0}
};
@ -98,7 +106,7 @@ static void usage(bool status) {
" [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 Start tincd.\n"
" start [tincd options] Start tincd.\n"
" stop Stop tincd.\n"
" restart Restart tincd.\n"
" reload Partially reload configuration of running tincd.\n"
@ -130,7 +138,7 @@ static bool parse_options(int argc, char **argv) {
int r;
int option_index = 0;
while((r = getopt_long(argc, argv, "c:n:", long_options, &option_index)) != EOF) {
while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;