From 2e69e894566d32001120d76d7ba58cdacb56d279 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 21 Feb 2011 10:25:52 +0100 Subject: s3-auth Rename auth_serversupplied_info varaiables: server_info -> session_info These variables, of type struct auth_serversupplied_info were poorly named when added into 2001, and in good consistant practice, this has extended all over the codebase in the years since. The structure is also not ideal for it's current purpose. Originally intended to convey the results of the authentication modules, it really describes all the essential attributes of a session. This rename will reduce the volume of a future patch to replaced these with a struct auth_session_info, with auth_serversupplied_info confined to the lower levels of the auth subsystem, and then eliminated. (The new structure will be the output of create_local_token(), and the change in struct definition will ensure that this is always run, populating local groups and privileges). Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/smbd/sesssetup.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/smbd/sesssetup.c') diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 5a1776e698..d9333502b8 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -474,19 +474,19 @@ static void reply_spnego_ntlmssp(struct smb_request *req, { bool do_invalidate = true; DATA_BLOB response; - struct auth_serversupplied_info *server_info = NULL; + struct auth_serversupplied_info *session_info = NULL; struct smbd_server_connection *sconn = req->sconn; if (NT_STATUS_IS_OK(nt_status)) { - nt_status = auth_ntlmssp_steal_server_info(talloc_tos(), - (*auth_ntlmssp_state), &server_info); + nt_status = auth_ntlmssp_steal_session_info(talloc_tos(), + (*auth_ntlmssp_state), &session_info); } else { - /* Note that this server_info won't have a session + /* Note that this session_info won't have a session * key. But for map to guest, that's exactly the right * thing - we can't reasonably guess the key the * client wants, as the password was wrong */ nt_status = do_map_to_guest(nt_status, - &server_info, + &session_info, auth_ntlmssp_get_username(*auth_ntlmssp_state), auth_ntlmssp_get_domain(*auth_ntlmssp_state)); } @@ -505,7 +505,7 @@ static void reply_spnego_ntlmssp(struct smb_request *req, /* register_existing_vuid keeps the server info */ if (register_existing_vuid(sconn, vuid, - server_info, nullblob, + session_info, nullblob, auth_ntlmssp_get_username(*auth_ntlmssp_state)) != vuid) { /* The problem is, *auth_ntlmssp_state points @@ -522,7 +522,7 @@ static void reply_spnego_ntlmssp(struct smb_request *req, SSVAL(req->outbuf, smb_vwv3, 0); - if (server_info->guest) { + if (session_info->guest) { SSVAL(req->outbuf,smb_vwv2,1); } } -- cgit