commit eeea6a1e2de504cd628a14bcc25844a9a788b8c4
parent 4609aeff08633b1c9cb94e243e336bbc6745c8b2
Author: ukai <ukai>
Date: Wed, 30 Oct 2002 15:41:51 +0000
[w3m-dev 03362] Re: support for http://user:pass@www.url.com
* etc.c (loadPasswd): accept host, passwd
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-31 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03362] Re: support for http://user:pass@www.url.com
+ * etc.c (loadPasswd): accept host, passwd
+
2002-10-31 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03359] support for http://user:pass@www.url.com
diff --git a/etc.c b/etc.c
@@ -912,13 +912,15 @@ find_auth_user_passwd(ParsedURL *pu, char *realm,
/* passwd */
/*
- * machine <name>
+ * machine <host>
+ * host <host>
* port <port>
* proxy
* path <file>
* realm <realm>
* login <login>
* passwd <passwd>
+ * password <passwd>
*/
#define PASS_IS_READABLE_MSG "SECURITY NOTE: password file must not be accessible by others"
@@ -978,7 +980,7 @@ loadPasswd(void)
arg = Strnew_charp(q);
}
- if (!strcmp(p, "machine")) {
+ if (!strcmp(p, "machine") || !strcmp(p, "host")) {
add_auth_pass_entry(&ent);
bzero(&ent, sizeof(struct auth_pass));
ent.host = arg;
@@ -993,7 +995,7 @@ loadPasswd(void)
ent.realm = arg;
else if (!strcmp(p, "login"))
ent.uname = arg;
- else if (!strcmp(p, "password"))
+ else if (!strcmp(p, "password") || !strcmp(p, "passwd"))
ent.pwd = arg;
/* ignore */
}