diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-03-12 02:42:39 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-03-12 02:42:39 +0000 |
| commit | e1f131bab840f23b1ba5ae4ba36a4054857afc94 (patch) | |
| tree | 69e28799c1d097128dcc2c9e559284de0699be68 | |
| parent | dd43c1c9a02ed4f14636d981439e1814be261624 (diff) | |
| download | samba-e1f131bab840f23b1ba5ae4ba36a4054857afc94.tar.gz samba-e1f131bab840f23b1ba5ae4ba36a4054857afc94.tar.bz2 samba-e1f131bab840f23b1ba5ae4ba36a4054857afc94.zip | |
use password_ok() instead of calling crypt()
(This used to be commit 53dc8ea5e315abf9ee8d38ffdb8a3057df0235be)
| -rw-r--r-- | source3/cgi.c | 13 | ||||
| -rw-r--r-- | source3/web/cgi.c | 13 |
2 files changed, 4 insertions, 22 deletions
diff --git a/source3/cgi.c b/source3/cgi.c index 2008f9a8d3..6468c92917 100644 --- a/source3/cgi.c +++ b/source3/cgi.c @@ -459,8 +459,6 @@ handle a http authentication line static int cgi_handle_authorization(char *line) { char *p, *user, *pass; - struct passwd *pwd; - int ret=0; if (strncasecmp(line,"Basic ", 6)) { cgi_setup_error("401 Bad Authorization", "", @@ -478,20 +476,13 @@ static int cgi_handle_authorization(char *line) pass = p+1; /* currently only allow connections as root */ - if (strcasecmp(user,"root")) { + if (strcmp(user,"root")) { cgi_setup_error("401 Bad Authorization", "", "incorrect username/password"); } - - pwd = getpwnam(user); - - if (!strcmp((char *)crypt(pass, pwd->pw_passwd),pwd->pw_passwd)) { - ret = 1; - } - memset(pass, 0, strlen(pass)); - return ret; + return password_ok(user, pass, strlen(pass), NULL); } diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 2008f9a8d3..6468c92917 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -459,8 +459,6 @@ handle a http authentication line static int cgi_handle_authorization(char *line) { char *p, *user, *pass; - struct passwd *pwd; - int ret=0; if (strncasecmp(line,"Basic ", 6)) { cgi_setup_error("401 Bad Authorization", "", @@ -478,20 +476,13 @@ static int cgi_handle_authorization(char *line) pass = p+1; /* currently only allow connections as root */ - if (strcasecmp(user,"root")) { + if (strcmp(user,"root")) { cgi_setup_error("401 Bad Authorization", "", "incorrect username/password"); } - - pwd = getpwnam(user); - - if (!strcmp((char *)crypt(pass, pwd->pw_passwd),pwd->pw_passwd)) { - ret = 1; - } - memset(pass, 0, strlen(pass)); - return ret; + return password_ok(user, pass, strlen(pass), NULL); } |