Remove most of the remaining globals out of lib/util_sock.c.

[vlendec/samba-autobuild/.git] / source3 / smbd / session.c

diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 69f4a37c850f8c45effa8d887bd29fb112415a6e..000b2f5d9c9fc28bdf61e76b8bee28469b1b3978 100644 (file)
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -159,9 +159,9 @@ bool session_claim(user_struct *vuser)
           client_name() handles this case internally.
        */
 
-       hostname = client_name();
+       hostname = client_name(get_client_fd());
        if (strcmp(hostname, "UNKNOWN") == 0) {
-               hostname = client_addr(addr,sizeof(addr));
+               hostname = client_addr(get_client_fd(),addr,sizeof(addr));
        }
 
        fstrcpy(sessionid.username, vuser->user.unix_name);
@@ -171,7 +171,8 @@ bool session_claim(user_struct *vuser)
        sessionid.uid = vuser->uid;
        sessionid.gid = vuser->gid;
        fstrcpy(sessionid.remote_machine, get_remote_machine_name());
-       fstrcpy(sessionid.ip_addr_str, client_addr(addr,sizeof(addr)));
+       fstrcpy(sessionid.ip_addr_str,
+               client_addr(get_client_fd(),addr,sizeof(addr)));
        sessionid.connect_start = time(NULL);
 
        if (!smb_pam_claim_session(sessionid.username, sessionid.id_str,