Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #153 from rhansen/infer-use

Browse source
This commit is contained in:
Sandro 2020-06-12 21:30:16 +02:00 committed by GitHub
commit eb4b226af0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog.md
View file

@ -21,6 +21,9 @@ repository history](https://github.com/ddclient/ddclient/commits/master).
minute. minute.
* The `pid` option is now ignored when ddclient is not daemonized. * The `pid` option is now ignored when ddclient is not daemonized.
* ddclient now gracefully exits when interrupted by Ctrl-C. * ddclient now gracefully exits when interrupted by Ctrl-C.
* The way ddclient chooses the default for the `use` option has changed.
Rather than rely on the default, users should explicitly set the `use`
option.
## 2020-01-08 v3.9.1 ## 2020-01-08 v3.9.1

8
ddclient
View file

@ -1291,9 +1291,11 @@ sub init_config {
$opt{'quiet'} = 0 if opt('verbose'); $opt{'quiet'} = 0 if opt('verbose');
## infer the IP strategy if possible ## infer the IP strategy if possible
$opt{'use'} = 'ip' if !define($opt{'use'}) && defined($opt{'ip'}); if (!defined($opt{'use'})) {
$opt{'use'} = 'if' if !define($opt{'use'}) && defined($opt{'if'}); $opt{'use'} = 'web' if defined($opt{'web'});
$opt{'use'} = 'web' if !define($opt{'use'}) && defined($opt{'web'}); $opt{'use'} = 'if' if defined($opt{'if'});
$opt{'use'} = 'ip' if defined($opt{'ip'});
}
## sanity check ## sanity check
$opt{'max-interval'} = min(interval(opt('max-interval')), interval(default('max-interval'))); $opt{'max-interval'} = min(interval(opt('max-interval')), interval(default('max-interval')));