diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 18:33:38 -0400 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-07-20 15:52:24 +1000 |
| commit | a04bbd281c5b94166e23026ea06e98939250028c (patch) | |
| tree | bdf0598bb9c72a1e16d00e3ff1bf072d33f561ea /source3/smbd | |
| parent | 0bb8d133c9a39873828dbe977513edd31e1a7045 (diff) | |
| download | samba-a04bbd281c5b94166e23026ea06e98939250028c.tar.gz samba-a04bbd281c5b94166e23026ea06e98939250028c.tar.bz2 samba-a04bbd281c5b94166e23026ea06e98939250028c.zip | |
s3-auth: Refactor and rename auth_ntlmssp_server_info()
Rename it to auth_ntlmssp_steal_server_info() to make it clear that
the server_info struct is stolen from the auth_ntlmssp_state structure.
Use talloc_move instead of manual steal&clear
Add comments to explain what is going on.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/sesssetup.c | 3 | ||||
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 08119b2be1..8ff8e08a46 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -640,7 +640,8 @@ static void reply_spnego_ntlmssp(struct smb_request *req, struct smbd_server_connection *sconn = req->sconn; if (NT_STATUS_IS_OK(nt_status)) { - nt_status = auth_ntlmssp_server_info(talloc_tos(), (*auth_ntlmssp_state), &server_info); + nt_status = auth_ntlmssp_steal_server_info(talloc_tos(), + (*auth_ntlmssp_state), &server_info); } 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 4d0f03259b..a6adf8a66f 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -147,7 +147,7 @@ static NTSTATUS setup_ntlmssp_server_info(struct smbd_smb2_session *session, NTSTATUS status) { if (NT_STATUS_IS_OK(status)) { - status = auth_ntlmssp_server_info(session, + status = auth_ntlmssp_steal_server_info(session, session->auth_ntlmssp_state, &session->server_info); } else { |