w3m

commit 76a17e1b2ff797c305905f6aa82c737cb9a936e3
parent cfcba2a67a1a6a4ff47e1800db8a771b5033c11a
Author: ukai <ukai>
Date:   Wed, 11 Sep 2002 15:08:49 +0000

[w3m-dev 03311] Re: Passwords
* configure (config.h): default PASSWD_FILE
* fm.h (passwd_file): default PASSWD_FILE
From: Yuuichi Teranishi <teranisi@gohome.org>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
config.h.dist
 | 
1
+
M
file.c
 | 
2
++

3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-11  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [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 <teranisi@gohome.org>
 
 	* [w3m-dev 03311] Re: Passwords
diff --git 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
@@ -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;