diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | lib/url.c | 10 | ||||
| -rw-r--r-- | po/rpm.pot | 12 |
3 files changed, 11 insertions, 12 deletions
@@ -15,6 +15,7 @@ - fix: default for rd_timeoutsecs is 1 sec (avoid ufdio assertion). - fix: new FILENAMES tags require package index, not pointer in lookups. - rename new FILENAMES tags to BASENAMES/DIRNAMES/DIRINDEXES. + - fix: don't look at password when searching urlCache. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. @@ -146,12 +146,14 @@ static int urlStrcmp(const char *str1, const char *str2) return 0; } -static void urlFind(urlinfo *uret, int mustAsk) +#define urlFind(_a, _b) XurlFind(_a, _b, __LINE__) +static void XurlFind(urlinfo *uret, int mustAsk, unsigned line) { urlinfo u; int ucx; int i; +fprintf(stderr, "*** urlFind(%p,%d) %s:%u\n", uret, mustAsk, __FILE__, line); if (uret == NULL) return; @@ -173,14 +175,10 @@ static void urlFind(urlinfo *uret, int mustAsk) */ if (urlStrcmp(u->service, ou->service)) continue; - if (urlStrcmp(u->service, ou->service)) - continue; if (urlStrcmp(u->host, ou->host)) continue; if (urlStrcmp(u->user, ou->user)) continue; - if (urlStrcmp(u->password, ou->password)) - continue; if (urlStrcmp(u->portstr, ou->portstr)) continue; break; /* Found item in cache */ @@ -223,7 +221,7 @@ static void urlFind(urlinfo *uret, int mustAsk) if (mustAsk || (u->user != NULL && u->password == NULL)) { char * prompt; - prompt = alloca(strlen(u->host) + strlen(u->user) + 40); + prompt = alloca(strlen(u->host) + strlen(u->user) + 256); sprintf(prompt, _("Password for %s@%s: "), u->user, u->host); FREE(u->password); u->password = xstrdup( /*@-unrecog@*/ getpass(prompt) /*@=unrecog@*/ ); diff --git a/po/rpm.pot b/po/rpm.pot index 89e1528c5..c69d703ff 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-10 10:36-0500\n" +"POT-Creation-Date: 1999-12-10 13:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2838,7 +2838,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "" -#: lib/rpmdb.c:157 lib/url.c:451 +#: lib/rpmdb.c:157 lib/url.c:457 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -3398,22 +3398,22 @@ msgstr "" msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:227 +#: lib/url.c:232 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:252 lib/url.c:278 +#: lib/url.c:258 lib/url.c:284 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:415 +#: lib/url.c:421 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: lib/url.c:474 +#: lib/url.c:480 #, c-format msgid "failed to create %s: %s\n" msgstr "" |