From 46e147cf1f9dd6080337bc80208f930d217e2264 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Wed, 30 Oct 2002 15:39:41 +0000
Subject: [w3m-dev 03359] support for http://user:pass@www.url.com * etc.c
 (find_auth_user_passwd): use ParsedURL for args 	use user and passwd if
 these are defined in ParsedURL * file.c (getAuthCookie): change
 find_auth_user_passwd() * proto.h (find_auth_user_passwd): change prototype
 From: Fumitoshi UKAI  <ukai@debian.or.jp>

---
 ChangeLog | 10 +++++++++-
 etc.c     | 12 +++++++++---
 file.c    |  5 ++---
 proto.h   |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 546e514..e778afb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-31  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 03359] support for http://user:pass@www.url.com
+	* etc.c (find_auth_user_passwd): use ParsedURL for args
+		use user and passwd if these are defined in ParsedURL
+	* file.c (getAuthCookie): change find_auth_user_passwd()
+	* proto.h (find_auth_user_passwd): change prototype
+
 2002-10-30  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03357] tab in <pre> in <ul>,<ol>,...
@@ -4035,4 +4043,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.458 2002/10/30 03:58:59 ukai Exp $
+$Id: ChangeLog,v 1.459 2002/10/30 15:39:41 ukai Exp $
diff --git a/etc.c b/etc.c
index a8c716d..848d23e 100644
--- a/etc.c
+++ b/etc.c
@@ -1,4 +1,4 @@
-/* $Id: etc.c,v 1.25 2002/09/28 16:30:07 ukai Exp $ */
+/* $Id: etc.c,v 1.26 2002/10/30 15:39:41 ukai Exp $ */
 #include "fm.h"
 #include <pwd.h>
 #include "myctype.h"
@@ -891,11 +891,17 @@ find_auth_pass_entry(char *host, int port, char *file, char *realm,
 }
 
 int
-find_auth_user_passwd(char *host, int port, char *file, char *realm,
+find_auth_user_passwd(ParsedURL *pu, char *realm,
 		      Str *uname, Str *pwd, int is_proxy)
 {
     struct auth_pass *ent;
-    ent = find_auth_pass_entry(host, port, file, realm, is_proxy);
+
+    if (pu->user && pu->pass) {
+	*uname = Strnew_charp(pu->user);
+	*pwd = Strnew_charp(pu->pass);
+	return 1;
+    }
+    ent = find_auth_pass_entry(pu->host, pu->port, pu->file, realm, is_proxy);
     if (ent) {
 	*uname = ent->uname;
 	*pwd = ent->pwd;
diff --git a/file.c b/file.c
index bca214c..bc705fd 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.106 2002/10/30 03:58:59 ukai Exp $ */
+/* $Id: file.c,v 1.107 2002/10/30 15:39:41 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -1390,8 +1390,7 @@ getAuthCookie(struct http_auth *hauth, char *auth_header,
 				 auth_header_len);
 
 	if (!a_found &&
-	    find_auth_user_passwd(pu->host, pu->port, pu->file, realm,
-				  &uname, &pwd, proxy)) {
+	    find_auth_user_passwd(pu, realm, &uname, &pwd, proxy)) {
 	    /* found username & password in passwd file */ ;
 	}
 	else {
diff --git a/proto.h b/proto.h
index f64bb0e..a8dee9e 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.47 2002/09/24 16:35:02 ukai Exp $ */
+/* $Id: proto.h,v 1.48 2002/10/30 15:39:41 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -521,7 +521,7 @@ extern void set_environ(char *var, char *value);
 extern FILE *localcgi_post(char *, char *, FormList *, char *);
 extern FILE *localcgi_get(char *, char *, char *);
 extern void loadPasswd(void);
-extern int find_auth_user_passwd(char *host, int port, char *file, char *realm,
+extern int find_auth_user_passwd(ParsedURL *pu, char *realm,
 				 Str *uname, Str *pwd, int is_proxy);
 extern Str find_auth_cookie(char *host, int port, char *file, char *realm);
 extern void add_auth_cookie(char *host, int port, char *file, char *realm,
-- 
cgit v1.2.3