diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-21 14:57:16 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-28 11:12:13 +0200 |
| commit | 92fd03c5f08055283af55f5a1dffaf84edb7e9ce (patch) | |
| tree | ca64a5af98ea007eca9d7720d5d7e261672cd70c | |
| parent | a3995ef31cfbd798921bf5fd34721b4251e173be (diff) | |
| download | samba-92fd03c5f08055283af55f5a1dffaf84edb7e9ce.tar.gz samba-92fd03c5f08055283af55f5a1dffaf84edb7e9ce.tar.bz2 samba-92fd03c5f08055283af55f5a1dffaf84edb7e9ce.zip | |
s3: Lift smbd_server_fd() from pass_check()
| -rw-r--r-- | source3/auth/auth_unix.c | 7 | ||||
| -rw-r--r-- | source3/auth/pass_check.c | 8 | ||||
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/web/cgi.c | 8 |
4 files changed, 19 insertions, 9 deletions
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c index c50ac78ee4..87cfdb9dd5 100644 --- a/source3/auth/auth_unix.c +++ b/source3/auth/auth_unix.c @@ -37,16 +37,23 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context, { NTSTATUS nt_status; struct passwd *pass = NULL; + const char *rhost; + char addr[INET6_ADDRSTRLEN]; DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name)); become_root(); pass = Get_Pwnam_alloc(talloc_tos(), user_info->mapped.account_name); + rhost = client_name(smbd_server_fd()); + if (strequal(rhost,"UNKNOWN")) + rhost = client_addr(smbd_server_fd(), addr, sizeof(addr)); + /** @todo This call assumes a ASCII password, no charset transformation is done. We may need to revisit this **/ nt_status = pass_check(pass, pass ? pass->pw_name : user_info->mapped.account_name, + rhost, user_info->password.plaintext, true); diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index 80e7da91df..c61a10ba1b 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -660,6 +660,7 @@ return NT_STATUS_OK on correct match, appropriate error otherwise NTSTATUS pass_check(const struct passwd *pass, const char *user, + const char *rhost, const char *password, bool run_cracker) { @@ -668,13 +669,6 @@ NTSTATUS pass_check(const struct passwd *pass, NTSTATUS nt_status; - const char *rhost; - char addr[INET6_ADDRSTRLEN]; - - rhost = client_name(smbd_server_fd()); - if (strequal(rhost,"UNKNOWN")) - rhost = client_addr(smbd_server_fd(), addr, sizeof(addr)); - #ifdef DEBUG_PASSWORD DEBUG(100, ("checking user=[%s] pass=[%s]\n", user, password)); #endif diff --git a/source3/include/proto.h b/source3/include/proto.h index e82b1ac486..e2d1c94e7b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -232,7 +232,10 @@ bool smb_pam_close_session(char *in_user, char *tty, char *rhost); /* The following definitions come from auth/pass_check.c */ void dfs_unlogin(void); -NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *password, +NTSTATUS pass_check(const struct passwd *pass, + const char *user, + const char *rhost, + const char *password, bool run_cracker); /* The following definitions come from auth/token_util.c */ diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 9c9a365457..794152cd99 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -339,6 +339,8 @@ static bool cgi_handle_authorization(char *line) char *p; fstring user, user_pass; struct passwd *pass = NULL; + const char *rhost; + char addr[INET6_ADDRSTRLEN]; if (!strnequal(line,"Basic ", 6)) { goto err; @@ -369,11 +371,15 @@ static bool cgi_handle_authorization(char *line) pass = getpwnam_alloc(talloc_autofree_context(), user); + rhost = client_name(1); + if (strequal(rhost,"UNKNOWN")) + rhost = client_addr(1, addr, sizeof(addr)); + /* * Validate the password they have given. */ - if NT_STATUS_IS_OK(pass_check(pass, user, user_pass, false)) { + if NT_STATUS_IS_OK(pass_check(pass, user, rhost, user_pass, false)) { if (pass) { /* * Password was ok. |