diff --git a/ddclient.in b/ddclient.in index 578847f..6f0a34a 100755 --- a/ddclient.in +++ b/ddclient.in @@ -132,7 +132,7 @@ my $last_emailbody = ''; ## If run as *d (e.g., ddclientd) then daemonize by default (but allow ## flags and options to override). -my $daemon_default = ($programd =~ /d$/) ? interval('5m') : 0; +my $daemon_default = ($programd =~ /d$/) ? interval('5m') : undef; use vars qw($file $lineno); local $file = ''; @@ -562,7 +562,7 @@ my %variables = ( '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), + 'pid' => setv(T_FILE, 0, 0, undef, undef), 'proxy' => setv(T_FQDNP, 0, 0, undef, undef), 'protocol' => setv(T_PROTO, 0, 0, 'dyndns2', undef), @@ -581,18 +581,18 @@ my %variables = ( 'webv4-skip' => setv(T_STRING,0, 0, undef, undef), 'webv6' => setv(T_STRING,0, 0, 'ipify-ipv6', undef), 'webv6-skip' => setv(T_STRING,0, 0, undef, undef), - 'fw' => setv(T_ANY, 0, 0, '', undef), + 'fw' => setv(T_ANY, 0, 0, undef, undef), 'fw-skip' => setv(T_STRING,0, 0, undef, undef), - 'fwv4' => setv(T_ANY, 0, 0, '', undef), + 'fwv4' => setv(T_ANY, 0, 0, undef, undef), 'fwv4-skip' => setv(T_STRING,0, 0, undef, undef), - 'fwv6' => setv(T_ANY, 0, 0, '', undef), + 'fwv6' => setv(T_ANY, 0, 0, undef, undef), 'fwv6-skip' => setv(T_STRING,0, 0, undef, undef), 'fw-login' => setv(T_LOGIN, 0, 0, undef, undef), 'fw-password' => setv(T_PASSWD,0, 0, undef, undef), - 'cmd' => setv(T_PROG, 0, 0, '', undef), + 'cmd' => setv(T_PROG, 0, 0, undef, undef), 'cmd-skip' => setv(T_STRING,0, 0, undef, undef), - 'cmdv4' => setv(T_PROG, 0, 0, '', undef), - 'cmdv6' => setv(T_PROG, 0, 0, '', undef), + 'cmdv4' => setv(T_PROG, 0, 0, undef, undef), + 'cmdv6' => setv(T_PROG, 0, 0, undef, undef), 'timeout' => setv(T_DELAY, 0, 0, interval('120s'), interval('120s')), 'retry' => setv(T_BOOL, 0, 0, 0, undef), @@ -601,8 +601,8 @@ my %variables = ( '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), + 'mail' => setv(T_EMAIL, 0, 0, undef, undef), + 'mail-failure' => setv(T_EMAIL, 0, 0, undef, undef), 'max-warn' => setv(T_NUMBER,0, 0, 1, undef), 'exec' => setv(T_BOOL, 0, 0, 1, undef), @@ -611,9 +611,9 @@ my %variables = ( '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), + 'geturl' => setv(T_STRING,0, 0, undef, undef), - 'postscript' => setv(T_POSTS, 0, 0, '', undef), + 'postscript' => setv(T_POSTS, 0, 0, undef, undef), 'ssl_ca_dir' => setv(T_FILE, 0, 0, undef, undef), 'ssl_ca_file' => setv(T_FILE, 0, 0, undef, undef), 'redirect' => setv(T_NUMBER,0, 0, 0, undef) @@ -637,19 +637,19 @@ my %variables = ( 'webv4-skip' => setv(T_STRING,0, 0, undef, undef), 'webv6' => setv(T_STRING,0, 0, 'ipify-ipv6', undef), 'webv6-skip' => setv(T_STRING,0, 0, undef, undef), - 'fw' => setv(T_ANY, 0, 0, '', undef), + 'fw' => setv(T_ANY, 0, 0, undef, undef), 'fw-skip' => setv(T_STRING,0, 0, undef, undef), - 'fw-login' => setv(T_LOGIN, 0, 0, '', undef), - 'fw-password' => setv(T_PASSWD,0, 0, '', undef), + 'fw-login' => setv(T_LOGIN, 0, 0, undef, undef), + 'fw-password' => setv(T_PASSWD,0, 0, undef, undef), 'fw-ssl-validate' => setv(T_BOOL, 0, 0, 1, undef), - 'fwv4' => setv(T_ANY, 0, 0, '', undef), + 'fwv4' => setv(T_ANY, 0, 0, undef, undef), 'fwv4-skip' => setv(T_STRING,0, 0, undef, undef), - 'fwv6' => setv(T_ANY, 0, 0, '', undef), + 'fwv6' => setv(T_ANY, 0, 0, undef, undef), 'fwv6-skip' => setv(T_STRING,0, 0, undef, undef), - 'cmd' => setv(T_PROG, 0, 0, '', undef), + 'cmd' => setv(T_PROG, 0, 0, undef, undef), 'cmd-skip' => setv(T_STRING,0, 0, undef, undef), - 'cmdv4' => setv(T_PROG, 0, 0, '', undef), - 'cmdv6' => setv(T_PROG, 0, 0, '', undef), + 'cmdv4' => setv(T_PROG, 0, 0, undef, undef), + 'cmdv6' => setv(T_PROG, 0, 0, undef, 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), @@ -701,7 +701,7 @@ my %variables = ( }, 'dyndns-common-defaults' => { 'backupmx' => setv(T_BOOL, 0, 1, 0, undef), - 'mx' => setv(T_OFQDN, 0, 1, '', undef), + 'mx' => setv(T_OFQDN, 0, 1, undef, undef), 'static' => setv(T_BOOL, 0, 1, 0, undef), 'wildcard' => setv(T_BOOL, 0, 1, 0, undef), }, @@ -736,7 +736,7 @@ my %protocols = ( 'backupmx' => setv(T_BOOL, 0, 1, 0, undef), 'login' => setv(T_LOGIN, 0, 0, 'token', undef), 'min-interval' => setv(T_DELAY, 0, 0, interval('5m'), 0), - 'mx' => setv(T_OFQDN, 0, 1, '', undef), + 'mx' => setv(T_OFQDN, 0, 1, undef, undef), 'server' => setv(T_FQDNP, 0, 0, 'api.cloudflare.com/client/v4', undef), 'static' => setv(T_BOOL, 0, 1, 0, undef), 'ttl' => setv(T_NUMBER, 0, 0, 1, undef), @@ -852,7 +852,7 @@ my %protocols = ( %{$variables{'protocol-common-defaults'}}, 'backupmx' => setv(T_BOOL, 0, 1, 0, undef), 'min-interval' => setv(T_DELAY, 0, 0, interval('5m'), 0), - 'mx' => setv(T_OFQDN, 0, 1, '', undef), + 'mx' => setv(T_OFQDN, 0, 1, undef, undef), 'server' => setv(T_FQDNP, 0, 0, 'api.cp.easydns.com', undef), 'script' => setv(T_STRING, 0, 1, '/dyn/generic.php', undef), 'wildcard' => setv(T_BOOL, 0, 1, 0, undef), @@ -1014,7 +1014,7 @@ my %protocols = ( 'password' => undef, 'apikey' => setv(T_PASSWD, 1, 0, undef, undef), 'secretapikey' => setv(T_PASSWD, 1, 0, undef, undef), - 'root-domain' => setv(T_OFQDN, 0, 0, '', undef), + 'root-domain' => setv(T_OFQDN, 0, 0, undef, undef), 'on-root-domain' => setv(T_BOOL, 0, 0, 0, undef), }, }, @@ -1036,7 +1036,7 @@ my %protocols = ( %{$variables{'protocol-common-defaults'}}, 'backupmx' => setv(T_BOOL, 0, 1, 0, undef), 'custom' => setv(T_BOOL, 0, 1, 0, undef), - 'mx' => setv(T_OFQDN, 0, 1, '', undef), + 'mx' => setv(T_OFQDN, 0, 1, undef, undef), 'script' => setv(T_STRING, 0, 1, '/nic/update', undef), 'server' => setv(T_FQDNP, 0, 0, 'dyn.woima.fi', undef), 'static' => setv(T_BOOL, 0, 1, 0, undef), @@ -7216,7 +7216,7 @@ sub nic_porkbun_update { for my $host (@_) { my ($sub_domain, $domain); - if ($config{$host}{'root-domain'} ne '') { + if ($config{$host}{'root-domain'}) { # Process 'root-domain' option $domain = $config{$host}{'root-domain'}; $sub_domain = $host;