summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-01 06:17:32 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-01 06:17:32 +0000
commitb7ee989aa888a4bb59d3c11aa4c319f6945ec337 (patch)
treecddb81c53155f161c98b6c95e99abdb523ec7efd
parent97716129f5bc80c5219197c61d6682f676ec89a6 (diff)
downloadsamba-b7ee989aa888a4bb59d3c11aa4c319f6945ec337.tar.gz
samba-b7ee989aa888a4bb59d3c11aa4c319f6945ec337.tar.bz2
samba-b7ee989aa888a4bb59d3c11aa4c319f6945ec337.zip
Prompted by RedHat bugzilla bug #77999, convert the user's username and
password from 'display' to 'unix' before we check them. Andrew Bartlett (This used to be commit 98a4ebf55cfce9da2c187d89a4f9c7b34e5f999e)
-rw-r--r--source3/web/cgi.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 35f3266283..46f33789bf 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -297,7 +297,8 @@ handle a http authentication line
***************************************************************************/
static BOOL cgi_handle_authorization(char *line)
{
- char *p, *user, *user_pass;
+ char *p;
+ fstring user, user_pass;
struct passwd *pass = NULL;
if (strncasecmp(line,"Basic ", 6)) {
@@ -314,9 +315,15 @@ static BOOL cgi_handle_authorization(char *line)
goto err;
}
*p = 0;
- user = line;
- user_pass = p+1;
-
+
+ convert_string(CH_DISPLAY, CH_UNIX,
+ line, -1,
+ user, sizeof(user));
+
+ convert_string(CH_DISPLAY, CH_UNIX,
+ p+1, -1,
+ user_pass, sizeof(user_pass));
+
/*
* Try and get the user from the UNIX password file.
*/