[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>
This commit is contained in:
Fumitoshi UKAI
2002-10-30 15:41:51 +00:00
parent 46e147cf1f
commit 10dc85c25d
2 changed files with 12 additions and 5 deletions

View File

@@ -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> 2002-10-31 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03359] support for http://user:pass@www.url.com * [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 * release-0-2-1
* import w3m-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 $

10
etc.c
View File

@@ -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 "fm.h"
#include <pwd.h> #include <pwd.h>
#include "myctype.h" #include "myctype.h"
@@ -912,13 +912,15 @@ find_auth_user_passwd(ParsedURL *pu, char *realm,
/* passwd */ /* passwd */
/* /*
* machine <name> * machine <host>
* host <host>
* port <port> * port <port>
* proxy * proxy
* path <file> * path <file>
* realm <realm> * realm <realm>
* login <login> * login <login>
* passwd <passwd> * passwd <passwd>
* password <passwd>
*/ */
#define PASS_IS_READABLE_MSG "SECURITY NOTE: password file must not be accessible by others" #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); arg = Strnew_charp(q);
} }
if (!strcmp(p, "machine")) { if (!strcmp(p, "machine") || !strcmp(p, "host")) {
add_auth_pass_entry(&ent); add_auth_pass_entry(&ent);
bzero(&ent, sizeof(struct auth_pass)); bzero(&ent, sizeof(struct auth_pass));
ent.host = arg; ent.host = arg;
@@ -993,7 +995,7 @@ loadPasswd(void)
ent.realm = arg; ent.realm = arg;
else if (!strcmp(p, "login")) else if (!strcmp(p, "login"))
ent.uname = arg; ent.uname = arg;
else if (!strcmp(p, "password")) else if (!strcmp(p, "password") || !strcmp(p, "passwd"))
ent.pwd = arg; ent.pwd = arg;
/* ignore */ /* ignore */
} }