diff options
-rw-r--r-- | source3/include/ntdomain.h | 7 | ||||
-rw-r--r-- | source3/rpc_server/srv_pipe.c | 15 |
2 files changed, 3 insertions, 19 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index b89b0fea3a..74a59443c8 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -233,13 +233,6 @@ typedef struct pipes_struct { struct dcinfo *dc; /* Keeps the creds data from netlogon. */ /* - * Windows user info. - */ - fstring user_name; - fstring domain; - fstring wks; - - /* * Unix user name and credentials used when a pipe is authenticated. */ diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 05cdb65a83..4ac9f7a6f4 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -614,11 +614,6 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) ZERO_STRUCT(reply); - memset(p->user_name, '\0', sizeof(p->user_name)); - memset(p->pipe_user_name, '\0', sizeof(p->pipe_user_name)); - memset(p->domain, '\0', sizeof(p->domain)); - memset(p->wks, '\0', sizeof(p->wks)); - /* Set up for non-authenticated user. */ TALLOC_FREE(p->pipe_user.nt_user_token); p->pipe_user.ut.ngroups = 0; @@ -656,14 +651,10 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) return False; } } - - fstrcpy(p->user_name, a->ntlmssp_state->user); - fstrcpy(p->pipe_user_name, a->server_info->unix_name); - fstrcpy(p->domain, a->ntlmssp_state->domain); - fstrcpy(p->wks, a->ntlmssp_state->workstation); - DEBUG(5,("pipe_ntlmssp_verify_final: OK: user: %s domain: %s workstation: %s\n", - p->user_name, p->domain, p->wks)); + DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s " + "workstation: %s\n", a->ntlmssp_state->user, + a->ntlmssp_state->domain, a->ntlmssp_state->workstation)); /* * Store the UNIX credential data (uid/gid pair) in the pipe structure. |