From 10dc85c25d0f0e244ecca3644e61a2081b166bff Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 30 Oct 2002 15:41:51 +0000 Subject: [w3m-dev 03362] Re: support for http://user:pass@www.url.com * etc.c (loadPasswd): accept host, passwd From: Hironori SAKAMOTO --- ChangeLog | 7 ++++++- etc.c | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e778afb..603b24c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-31 Hironori SAKAMOTO + + * [w3m-dev 03362] Re: support for http://user:pass@www.url.com + * etc.c (loadPasswd): accept host, passwd + 2002-10-31 Fumitoshi UKAI * [w3m-dev 03359] support for http://user:pass@www.url.com @@ -4043,4 +4048,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.459 2002/10/30 15:39:41 ukai Exp $ +$Id: ChangeLog,v 1.460 2002/10/30 15:41:51 ukai Exp $ diff --git a/etc.c b/etc.c index 848d23e..a967521 100644 --- a/etc.c +++ b/etc.c @@ -1,4 +1,4 @@ -/* $Id: etc.c,v 1.26 2002/10/30 15:39:41 ukai Exp $ */ +/* $Id: etc.c,v 1.27 2002/10/30 15:41:51 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -912,13 +912,15 @@ find_auth_user_passwd(ParsedURL *pu, char *realm, /* passwd */ /* - * machine + * machine + * host * port * proxy * path * realm * login * passwd + * password */ #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 */ } -- cgit v1.2.3