diff --git a/ddclient.in b/ddclient.in index 8a52ae0..981234b 100755 --- a/ddclient.in +++ b/ddclient.in @@ -382,109 +382,109 @@ sub setv { } my %variables = ( 'global-defaults' => { - 'daemon' => setv(T_DELAY, 0, 0, 1, $daemon_default, interval('60s')), - 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef), - 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef), - 'pid' => setv(T_FILE, 0, 0, 1, "", undef), - 'proxy' => setv(T_FQDNP, 0, 0, 1, '', undef), - 'protocol' => setv(T_PROTO, 0, 0, 1, 'dyndns2', undef), + 'daemon' => setv(T_DELAY, 0, 0, $daemon_default, interval('60s')), + 'foreground' => setv(T_BOOL, 0, 0, 0, undef), + 'file' => setv(T_FILE, 0, 0, "$etc/$program.conf", undef), + 'cache' => setv(T_FILE, 0, 0, "$cachedir/$program.cache", undef), + 'pid' => setv(T_FILE, 0, 0, "", undef), + 'proxy' => setv(T_FQDNP, 0, 0, '', undef), + 'protocol' => setv(T_PROTO, 0, 0, 'dyndns2', undef), - 'use' => setv(T_USE, 0, 0, 1, 'ip', undef), - 'usev4' => setv(T_USEV4, 0, 0, 1, undef, undef), - 'usev6' => setv(T_USEV6, 0, 0, 1, undef, undef), - 'ip' => setv(T_IP, 0, 0, 1, undef, undef), - 'ipv4' => setv(T_IPV4, 0, 0, 1, undef, undef), - 'ipv6' => setv(T_IPV6, 0, 0, 1, undef, undef), - 'if' => setv(T_IF, 0, 0, 1, 'ppp0', undef), - 'ifv4' => setv(T_IF, 0, 0, 1, undef, undef), - 'ifv6' => setv(T_IF, 0, 0, 1, undef, undef), - 'if-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'web' => setv(T_STRING,0, 0, 1, 'dyndns', undef), - 'web-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'webv4' => setv(T_STRING,0, 0, 1, '', undef), - 'webv4-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'webv6' => setv(T_STRING,0, 0, 1, '', undef), - 'webv6-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'fw' => setv(T_ANY, 0, 0, 1, '', undef), - 'fw-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'fwv4' => setv(T_ANY, 0, 0, 1, '', undef), - 'fwv4-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'fwv6' => setv(T_ANY, 0, 0, 1, '', undef), - 'fwv6-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'fw-login' => setv(T_LOGIN, 1, 0, 1, '', undef), - 'fw-password' => setv(T_PASSWD,1, 0, 1, '', undef), - 'cmd' => setv(T_PROG, 0, 0, 1, '', undef), - 'cmd-skip' => setv(T_STRING,1, 0, 1, '', undef), - 'cmdv4' => setv(T_PROG, 0, 0, 1, '', undef), - 'cmdv6' => setv(T_PROG, 0, 0, 1, '', undef), + 'use' => setv(T_USE, 0, 0, 'ip', undef), + 'usev4' => setv(T_USEV4, 0, 0, undef, undef), + 'usev6' => setv(T_USEV6, 0, 0, undef, undef), + 'ip' => setv(T_IP, 0, 0, undef, undef), + 'ipv4' => setv(T_IPV4, 0, 0, undef, undef), + 'ipv6' => setv(T_IPV6, 0, 0, undef, undef), + 'if' => setv(T_IF, 0, 0, 'ppp0', undef), + 'ifv4' => setv(T_IF, 0, 0, undef, undef), + 'ifv6' => setv(T_IF, 0, 0, undef, undef), + 'if-skip' => setv(T_STRING,1, 0, '', undef), + 'web' => setv(T_STRING,0, 0, 'dyndns', undef), + 'web-skip' => setv(T_STRING,1, 0, '', undef), + 'webv4' => setv(T_STRING,0, 0, '', undef), + 'webv4-skip' => setv(T_STRING,1, 0, '', undef), + 'webv6' => setv(T_STRING,0, 0, '', undef), + 'webv6-skip' => setv(T_STRING,1, 0, '', undef), + 'fw' => setv(T_ANY, 0, 0, '', undef), + 'fw-skip' => setv(T_STRING,1, 0, '', undef), + 'fwv4' => setv(T_ANY, 0, 0, '', undef), + 'fwv4-skip' => setv(T_STRING,1, 0, '', undef), + 'fwv6' => setv(T_ANY, 0, 0, '', undef), + 'fwv6-skip' => setv(T_STRING,1, 0, '', undef), + 'fw-login' => setv(T_LOGIN, 1, 0, '', undef), + 'fw-password' => setv(T_PASSWD,1, 0, '', undef), + 'cmd' => setv(T_PROG, 0, 0, '', undef), + 'cmd-skip' => setv(T_STRING,1, 0, '', undef), + 'cmdv4' => setv(T_PROG, 0, 0, '', undef), + 'cmdv6' => setv(T_PROG, 0, 0, '', undef), - 'timeout' => setv(T_DELAY, 0, 0, 1, interval('120s'), interval('120s')), - 'retry' => setv(T_BOOL, 0, 0, 0, 0, undef), - 'force' => setv(T_BOOL, 0, 0, 0, 0, undef), - 'ssl' => setv(T_BOOL, 0, 0, 0, 0, undef), - 'syslog' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'facility' => setv(T_STRING,0, 0, 1, 'daemon', undef), - 'priority' => setv(T_STRING,0, 0, 1, 'notice', undef), - 'mail' => setv(T_EMAIL, 0, 0, 1, '', undef), - 'mail-failure' => setv(T_EMAIL, 0, 0, 1, '', undef), + 'timeout' => setv(T_DELAY, 0, 0, interval('120s'), interval('120s')), + 'retry' => setv(T_BOOL, 0, 0, 0, undef), + 'force' => setv(T_BOOL, 0, 0, 0, undef), + 'ssl' => setv(T_BOOL, 0, 0, 0, undef), + 'syslog' => setv(T_BOOL, 0, 0, 0, undef), + 'facility' => setv(T_STRING,0, 0, 'daemon', undef), + 'priority' => setv(T_STRING,0, 0, 'notice', undef), + 'mail' => setv(T_EMAIL, 0, 0, '', undef), + 'mail-failure' => setv(T_EMAIL, 0, 0, '', undef), - 'exec' => setv(T_BOOL, 0, 0, 1, 1, undef), - 'debug' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'verbose' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'quiet' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'help' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'test' => setv(T_BOOL, 0, 0, 1, 0, undef), - 'geturl' => setv(T_STRING,0, 0, 0, '', undef), + 'exec' => setv(T_BOOL, 0, 0, 1, undef), + 'debug' => setv(T_BOOL, 0, 0, 0, undef), + 'verbose' => setv(T_BOOL, 0, 0, 0, undef), + 'quiet' => setv(T_BOOL, 0, 0, 0, undef), + 'help' => setv(T_BOOL, 0, 0, 0, undef), + 'test' => setv(T_BOOL, 0, 0, 0, undef), + 'geturl' => setv(T_STRING,0, 0, '', undef), - 'postscript' => setv(T_POSTS, 0, 0, 1, '', undef), + 'postscript' => setv(T_POSTS, 0, 0, '', undef), }, 'service-common-defaults' => { - 'server' => setv(T_FQDNP, 1, 0, 1, 'members.dyndns.org', undef), - 'login' => setv(T_LOGIN, 1, 0, 1, '', undef), - 'password' => setv(T_PASSWD,1, 0, 1, '', undef), - 'host' => setv(T_STRING,1, 1, 1, '', undef), + 'server' => setv(T_FQDNP, 1, 0, 'members.dyndns.org', undef), + 'login' => setv(T_LOGIN, 1, 0, '', undef), + 'password' => setv(T_PASSWD,1, 0, '', undef), + 'host' => setv(T_STRING,1, 1, '', undef), - 'use' => setv(T_USE, 0, 0, 1, 'ip', undef), - 'usev4' => setv(T_USEV4, 0, 0, 1, undef, undef), - 'usev6' => setv(T_USEV6, 0, 0, 1, undef, undef), - 'if' => setv(T_IF, 0, 0, 1, 'ppp0', undef), - 'ifv4' => setv(T_IF, 0, 0, 1, undef, undef), - 'ifv6' => setv(T_IF, 0, 0, 1, undef, undef), - 'if-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'web' => setv(T_STRING,0, 0, 1, 'dyndns', undef), - 'web-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'webv4' => setv(T_STRING,0, 0, 1, undef, undef), - 'webv4-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'webv6' => setv(T_STRING,0, 0, 1, undef, undef), - 'webv6-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'fw' => setv(T_ANY, 0, 0, 1, '', undef), - 'fw-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'fwv4' => setv(T_ANY, 0, 0, 1, '', undef), - 'fwv4-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'fwv6' => setv(T_ANY, 0, 0, 1, '', undef), - 'fwv6-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'fw-login' => setv(T_LOGIN, 0, 0, 1, '', undef), - 'fw-password' => setv(T_PASSWD,0, 0, 1, '', undef), - 'cmd' => setv(T_PROG, 0, 0, 1, '', undef), - 'cmd-skip' => setv(T_STRING,0, 0, 1, '', undef), - 'cmdv4' => setv(T_PROG, 0, 0, 1, '', undef), - 'cmdv6' => setv(T_PROG, 0, 0, 1, '', undef), - 'ip' => setv(T_IP, 0, 1, 0, undef, undef), - 'ipv4' => setv(T_IPV4, 0, 1, 0, undef, undef), - 'ipv6' => setv(T_IPV6, 0, 1, 0, undef, undef), - 'wtime' => setv(T_DELAY, 0, 1, 1, 0, interval('30s')), - 'mtime' => setv(T_NUMBER,0, 1, 0, 0, undef), - 'atime' => setv(T_NUMBER,0, 1, 0, 0, undef), - 'status' => setv(T_ANY, 0, 1, 0, '', undef), - 'status-ipv4' => setv(T_ANY, 0, 1, 0, '', undef), - 'status-ipv6' => setv(T_ANY, 0, 1, 0, '', undef), - 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('30s'), 0), - 'max-interval' => setv(T_DELAY, 0, 0, 1, interval('25d'), 0), - 'min-error-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0), + 'use' => setv(T_USE, 0, 0, 'ip', undef), + 'usev4' => setv(T_USEV4, 0, 0, undef, undef), + 'usev6' => setv(T_USEV6, 0, 0, undef, undef), + 'if' => setv(T_IF, 0, 0, 'ppp0', undef), + 'ifv4' => setv(T_IF, 0, 0, undef, undef), + 'ifv6' => setv(T_IF, 0, 0, undef, undef), + 'if-skip' => setv(T_STRING,0, 0, '', undef), + 'web' => setv(T_STRING,0, 0, 'dyndns', undef), + 'web-skip' => setv(T_STRING,0, 0, '', undef), + 'webv4' => setv(T_STRING,0, 0, undef, undef), + 'webv4-skip' => setv(T_STRING,0, 0, '', undef), + 'webv6' => setv(T_STRING,0, 0, undef, undef), + 'webv6-skip' => setv(T_STRING,0, 0, '', undef), + 'fw' => setv(T_ANY, 0, 0, '', undef), + 'fw-skip' => setv(T_STRING,0, 0, '', undef), + 'fwv4' => setv(T_ANY, 0, 0, '', undef), + 'fwv4-skip' => setv(T_STRING,0, 0, '', undef), + 'fwv6' => setv(T_ANY, 0, 0, '', undef), + 'fwv6-skip' => setv(T_STRING,0, 0, '', undef), + 'fw-login' => setv(T_LOGIN, 0, 0, '', undef), + 'fw-password' => setv(T_PASSWD,0, 0, '', undef), + 'cmd' => setv(T_PROG, 0, 0, '', undef), + 'cmd-skip' => setv(T_STRING,0, 0, '', undef), + 'cmdv4' => setv(T_PROG, 0, 0, '', undef), + 'cmdv6' => setv(T_PROG, 0, 0, '', undef), + 'ip' => setv(T_IP, 0, 1, undef, undef), + 'ipv4' => setv(T_IPV4, 0, 1, undef, undef), + 'ipv6' => setv(T_IPV6, 0, 1, undef, undef), + 'wtime' => setv(T_DELAY, 0, 1, 0, interval('30s')), + 'mtime' => setv(T_NUMBER,0, 1, 0, undef), + 'atime' => setv(T_NUMBER,0, 1, 0, undef), + 'status' => setv(T_ANY, 0, 1, '', undef), + 'status-ipv4' => setv(T_ANY, 0, 1, '', undef), + 'status-ipv6' => setv(T_ANY, 0, 1, '', undef), + 'min-interval' => setv(T_DELAY, 0, 0, interval('30s'), 0), + 'max-interval' => setv(T_DELAY, 0, 0, interval('25d'), 0), + 'min-error-interval' => setv(T_DELAY, 0, 0, interval('5m'), 0), - 'warned-min-interval' => setv(T_ANY, 0, 1, 0, 0, undef), - 'warned-min-error-interval' => setv(T_ANY, 0, 1, 0, 0, undef), + 'warned-min-interval' => setv(T_ANY, 0, 1, 0, undef), + 'warned-min-error-interval' => setv(T_ANY, 0, 1, 0, undef), }, 'dyndns-common-defaults' => { 'static' => setv(T_BOOL, 0, 1, 0, undef), @@ -888,7 +888,7 @@ my @opt = ( "", [ "cmd", "=s", "-cmd program : deprecated, use 'cmdv4' or 'cmdv6'" ], [ "cmd-skip", "=s", "-cmd-skip pattern : deprecated, filter in program wrapper script" ], - [ "cmdv4", "=s", "-cmdv4 program : obtain IPv6 address from by calling {program}" ], + [ "cmdv4", "=s", "-cmdv4 program : obtain IPv4 address from by calling {program}" ], [ "cmdv6", "=s", "-cmdv6 program : obtain IPv6 address from by calling {program}" ], "", [ "login", "=s", "-login user : login as 'user'" ],