diff options
| author | Andreas Schneider <asn@redhat.com> | 2009-12-16 16:41:21 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-12-16 20:28:38 +0100 |
| commit | 1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2 (patch) | |
| tree | 6d420404d24e795bf7ddcbdfe7603359129f9cf6 /source4/auth/ntlm | |
| parent | ac2d31e24cfa24f6674b645b3661a1a2ce9ab060 (diff) | |
| download | samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.tar.gz samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.tar.bz2 samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.zip | |
s4-gensec: Replace gensec_get_peer_addr with new tsocket based fn.
Diffstat (limited to 'source4/auth/ntlm')
| -rw-r--r-- | source4/auth/ntlm/auth_unix.c | 6 | ||||
| -rw-r--r-- | source4/auth/ntlm/config.mk | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c index 1717b9d0e1..aa68bb161e 100644 --- a/source4/auth/ntlm/auth_unix.c +++ b/source4/auth/ntlm/auth_unix.c @@ -23,7 +23,8 @@ #include "auth/auth.h" #include "auth/ntlm/auth_proto.h" #include "system/passwd.h" /* needed by some systems for struct passwd */ -#include "lib/socket/socket.h" +#include "lib/socket/socket.h" +#include "lib/tsocket/tsocket.h" #include "auth/ntlm/pam_errors.h" #include "param/param.h" @@ -458,7 +459,8 @@ static NTSTATUS check_unix_password(TALLOC_CTX *ctx, struct loadparm_context *lp * if true set up a crack name routine. */ - nt_status = smb_pam_start(&pamh, user_info->mapped.account_name, user_info->remote_host ? user_info->remote_host->addr : NULL, pamconv); + nt_status = smb_pam_start(&pamh, user_info->mapped.account_name, + user_info->remote_host ? tsocket_address_inet_addr_string(user_info->remote_host, ctx) : NULL, pamconv); if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; } diff --git a/source4/auth/ntlm/config.mk b/source4/auth/ntlm/config.mk index cb9c3b6cc9..a0d668f748 100644 --- a/source4/auth/ntlm/config.mk +++ b/source4/auth/ntlm/config.mk @@ -57,7 +57,7 @@ auth_developer_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_developer.o) [MODULE::auth_unix] INIT_FUNCTION = auth_unix_init SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER +PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET auth_unix_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_unix.o) |