summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-21 14:59:14 +0200
committerVolker Lendecke <vl@samba.org>2010-08-28 11:12:13 +0200
commit520c5aae40ce882b8c5c020eb728d4198106d6b7 (patch)
treedaf0a657ae14521a03ad4aae4f6da4ce0954cb51
parent92fd03c5f08055283af55f5a1dffaf84edb7e9ce (diff)
downloadsamba-520c5aae40ce882b8c5c020eb728d4198106d6b7.tar.gz
samba-520c5aae40ce882b8c5c020eb728d4198106d6b7.tar.bz2
samba-520c5aae40ce882b8c5c020eb728d4198106d6b7.zip
s3: Remove smbd_server_conn() from check_unix_security
-rw-r--r--source3/auth/auth_unix.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 87cfdb9dd5..072ad8426c 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/samr.h"
+#include "smbd/globals.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
@@ -37,23 +38,17 @@ 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,
+ smbd_server_conn->client_id.name,
user_info->password.plaintext,
true);