diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-13 01:12:21 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-13 01:12:21 +0200 |
| commit | fc3eb5b295879cf899182f89b41d6bc66b27ad98 (patch) | |
| tree | c68357d7349ae09853c2d441e1f84da07024cb42 | |
| parent | 6ed085162423d0c3f1b7f432af1226d59654afbd (diff) | |
* apt-pkg/contrib/netrc.cc:
- replace non-posix gnu-extension strdupa with strdup
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 12 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index d8027fc24..34f472ee1 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -160,10 +160,10 @@ void maybe_add_auth (URI &Uri, string NetRCFile) { char login[64] = ""; char password[64] = ""; - char *netrcfile = strdupa (NetRCFile.c_str ()); + char *netrcfile = strdup(NetRCFile.c_str()); // first check for a generic host based netrc entry - char *host = strdupa (Uri.Host.c_str ()); + char *host = strdup(Uri.Host.c_str()); if (host && parsenetrc (host, login, password, netrcfile) == 0) { if (_config->FindB("Debug::Acquire::netrc", false) == true) @@ -173,13 +173,16 @@ void maybe_add_auth (URI &Uri, string NetRCFile) << std::endl; Uri.User = string (login); Uri.Password = string (password); + free(netrcfile); + free(host); return; } + free(host); // if host did not work, try Host+Path next, this will trigger // a lookup uri.startswith(host) in the netrc file parser (because // of the "/" - char *hostpath = strdupa (string(Uri.Host+Uri.Path).c_str ()); + char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str()); if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0) { if (_config->FindB("Debug::Acquire::netrc", false) == true) @@ -189,8 +192,9 @@ void maybe_add_auth (URI &Uri, string NetRCFile) << std::endl; Uri.User = string (login); Uri.Password = string (password); - return; } + free(netrcfile); + free(hostpath); } } } diff --git a/debian/changelog b/debian/changelog index 2c578d258..edcd2b851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,8 +54,10 @@ apt (0.8.14.2) UNRELEASED; urgency=low servers just send an absolute path so still deal with it properly - dequote URL taken from Location in redirects as we will otherwise quote an already quoted string in the request later (Closes: #602412) + * apt-pkg/contrib/netrc.cc: + - replace non-posix gnu-extension strdupa with strdup - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 11 May 2011 13:58:40 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 May 2011 01:08:04 +0200 apt (0.8.14.1) unstable; urgency=low |