diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-02-01 07:27:01 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-01 07:27:01 +0000 |
| commit | 9c858c3188bf26a754936fff5f1a1a0c263ba7cd (patch) | |
| tree | 15b6a4835f4101cf7c20705cf3bce525344505bd | |
| parent | 3b2244526c7ae64f744539154681b9883daebc3f (diff) | |
| download | samba-9c858c3188bf26a754936fff5f1a1a0c263ba7cd.tar.gz samba-9c858c3188bf26a754936fff5f1a1a0c263ba7cd.tar.bz2 samba-9c858c3188bf26a754936fff5f1a1a0c263ba7cd.zip | |
Merge from HEAD - convert username/password to unix before checking them in
SWAT.
(This used to be commit 8485c51bc47f45a6263bda83a0bc3ba15abcd250)
| -rw-r--r-- | source3/web/cgi.c | 15 |
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. */ |