diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-08 10:26:08 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-08 11:38:08 +0200 |
| commit | 34b29b11986095531488cd0139ecec6dd22e55d3 (patch) | |
| tree | cc0cd34bd3fab4df13eba3a90e6ce99468cf6b58 /source3/smbd | |
| parent | 984fec252af70ef54461ca84a6afedb97ff81dec (diff) | |
| download | samba-34b29b11986095531488cd0139ecec6dd22e55d3.tar.gz samba-34b29b11986095531488cd0139ecec6dd22e55d3.tar.bz2 samba-34b29b11986095531488cd0139ecec6dd22e55d3.zip | |
Revert "s3:auth Change auth_ntlmssp_server_info API to return NTSTATUS"
This reverts commit edba46ce94c335411ab337eeb4ef6f88fb3aae80.
Conflicts:
source3/auth/auth_ntlmssp.c
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/sesssetup.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 28e5aea39b..d707ba3021 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -637,7 +637,7 @@ static void reply_spnego_ntlmssp(struct smb_request *req, struct smbd_server_connection *sconn = smbd_server_conn; if (NT_STATUS_IS_OK(nt_status)) { - nt_status = auth_ntlmssp_server_info(talloc_tos(), (*auth_ntlmssp_state), &server_info); + server_info = auth_ntlmssp_server_info(talloc_tos(), (*auth_ntlmssp_state)); } else { /* Note that this server_info won't have a session * key. But for map to guest, that's exactly the right diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 963dbe19e1..af9157107e 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -614,12 +614,11 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s uint64_t *out_session_id) { fstring tmp; - NTSTATUS status = auth_ntlmssp_server_info(session, session->auth_ntlmssp_state, - &session->server_info); - if (!NT_STATUS_IS_OK(status)) { + session->server_info = auth_ntlmssp_server_info(session, session->auth_ntlmssp_state); + if (!session->server_info) { auth_ntlmssp_end(&session->auth_ntlmssp_state); TALLOC_FREE(session); - return status; + return NT_STATUS_NO_MEMORY; } if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) || |