From 87442b63f4985c8f84db34d62d211365a5996521 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 11 Sep 2002 15:08:49 +0000 Subject: [w3m-dev 03311] Re: Passwords * configure (config.h): default PASSWD_FILE * fm.h (passwd_file): default PASSWD_FILE From: Yuuichi Teranishi --- ChangeLog | 8 +++++++- config.h.dist | 1 + file.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd69179..8ba7d2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-11 Fumitoshi UKAI + + * [w3m-dev 03312] Re: Passwords + * config.h.dist: PASSWD_FILE + * file.c (find_auth_user_passwd): return if passwd_file == NULL + 2002-09-11 Yuuichi Teranishi * [w3m-dev 03311] Re: Passwords @@ -3781,4 +3787,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.426 2002/09/11 14:54:33 ukai Exp $ +$Id: ChangeLog,v 1.427 2002/09/11 15:08:49 ukai Exp $ diff --git a/config.h.dist b/config.h.dist index 93985a9..0c016c7 100644 --- a/config.h.dist +++ b/config.h.dist @@ -167,6 +167,7 @@ MODEL=Linux.i686-monster-ja #define COOKIE_FILE "cookie" #define HISTORY_FILE "history" +#define PASSWD_FILE RC_DIR "/passwd" #define USER_MAILCAP RC_DIR "/mailcap" #define SYS_MAILCAP "/etc/mailcap" #define USER_MIMETYPES "~/.mime.types" diff --git a/file.c b/file.c index c1be464..cba9d5d 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.99 2002/09/10 18:21:36 ukai Exp $ */ +/* $Id: file.c,v 1.100 2002/09/11 15:08:54 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -1363,6 +1363,8 @@ find_auth_user_passwd(char *host, int port, char *file, char *realm, *uname = NULL; *pwd = NULL; + if (passwd_file == NULL) + return 0; if (stat(expandName(passwd_file), &st) < 0) return 0; -- cgit v1.2.3