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/auth | |
| 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/auth')
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 7184fa6b95..df4666aaee 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -84,9 +84,8 @@ void auth_ntlmssp_want_seal(struct auth_ntlmssp_state *auth_ntlmssp_state) } -NTSTATUS auth_ntlmssp_server_info(TALLOC_CTX *mem_ctx, - struct auth_ntlmssp_state *auth_ntlmssp_state, - struct auth_serversupplied_info **_server_info) +struct auth_serversupplied_info *auth_ntlmssp_server_info(TALLOC_CTX *mem_ctx, + struct auth_ntlmssp_state *auth_ntlmssp_state) { struct auth_serversupplied_info *server_info = auth_ntlmssp_state->server_info; data_blob_free(&server_info->user_session_key); @@ -96,11 +95,10 @@ NTSTATUS auth_ntlmssp_server_info(TALLOC_CTX *mem_ctx, auth_ntlmssp_state->ntlmssp_state->session_key.data, auth_ntlmssp_state->ntlmssp_state->session_key.length); if (auth_ntlmssp_state->ntlmssp_state->session_key.length && !server_info->user_session_key.data) { - return NT_STATUS_NO_MEMORY; + return NULL; } auth_ntlmssp_state->server_info = NULL; - *_server_info = talloc_steal(mem_ctx, server_info); - return NT_STATUS_OK; + return talloc_steal(mem_ctx, server_info); } struct ntlmssp_state *auth_ntlmssp_get_ntlmssp_state(struct auth_ntlmssp_state *auth_ntlmssp_state) |