diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2018-11-03 16:58:18 +0100 |
|---|---|---|
| committer | Michael Kaufmann <mail@michael-kaufmann.ch> | 2018-11-05 20:34:01 +0100 |
| commit | 53db15ba5524584196eedb3abe8d2e97fb5a3cc0 (patch) | |
| tree | 9e249e6b15f8e4580dd837cd15a6c678e2d6d057 /lib/netrc.h | |
| parent | a77b640cc0ddace57758946881294db6f03db16e (diff) | |
netrc: don't ignore the login name specified with "--user"
- for "--netrc", don't ignore the login/password specified with "--user",
only ignore the login/password in the URL.
This restores the netrc behaviour of curl 7.61.1 and earlier.
- fix the documentation of CURL_NETRC_REQUIRED
- improve the detection of login/password changes when reading .netrc
- don't read .netrc if both login and password are already set
Fixes #3213
Closes #3224
Diffstat (limited to 'lib/netrc.h')
| -rw-r--r-- | lib/netrc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/netrc.h b/lib/netrc.h index d980166e6..fe3dc357e 100644 --- a/lib/netrc.h +++ b/lib/netrc.h @@ -26,6 +26,8 @@ int Curl_parsenetrc(const char *host, char **loginp, char **passwordp, + bool *login_changed, + bool *password_changed, char *filename); /* Assume: (*passwordp)[0]=0, host[0] != 0. * If (*loginp)[0] = 0, search for login and password within a machine |