s3-auth rename vuid_serverinfo to session_info
authorAndrew Bartlett <abartlet@samba.org>
Sat, 14 Jan 2012 23:49:07 +0000 (10:49 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 25 Feb 2012 04:24:19 +0000 (05:24 +0100)
This matches the name used elsewhere in the code.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Feb 25 05:24:19 CET 2012 on sn-devel-104

source3/smbd/service.c

index f4f6e9a..b08811b 100644 (file)
@@ -380,7 +380,7 @@ static NTSTATUS find_forced_group(bool force_user,
 
 static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn,
                                              TALLOC_CTX *mem_ctx, int snum,
-                                              struct auth_session_info *vuid_serverinfo,
+                                              struct auth_session_info *session_info,
                                              DATA_BLOB password,
                                               struct auth_session_info **presult)
 {
@@ -388,7 +388,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
                 return make_session_info_guest(mem_ctx, presult);
         }
 
-        if (vuid_serverinfo != NULL) {
+        if (session_info != NULL) {
 
                struct auth_session_info *result;
 
@@ -396,7 +396,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
                  * This is the normal security != share case where we have a
                  * valid vuid from the session setup.                 */
 
-               if (security_session_user_level(vuid_serverinfo, NULL) < SECURITY_USER) {
+               if (security_session_user_level(session_info, NULL) < SECURITY_USER) {
                       if (!lp_guest_ok(snum)) {
                                 DEBUG(2, ("guest user (from session setup) "
                                           "not permitted to access this share "
@@ -404,19 +404,19 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
                                 return NT_STATUS_ACCESS_DENIED;
                         }
                 } else {
-                        if (!user_ok_token(vuid_serverinfo->unix_info->unix_name,
-                                          vuid_serverinfo->info->domain_name,
-                                           vuid_serverinfo->security_token, snum)) {
+                        if (!user_ok_token(session_info->unix_info->unix_name,
+                                          session_info->info->domain_name,
+                                           session_info->security_token, snum)) {
                                 DEBUG(2, ("user '%s' (from session setup) not "
                                           "permitted to access this share "
                                           "(%s)\n",
-                                          vuid_serverinfo->unix_info->unix_name,
+                                          session_info->unix_info->unix_name,
                                           lp_servicename(snum)));
                                 return NT_STATUS_ACCESS_DENIED;
                         }
                 }
 
-                result = copy_session_info(mem_ctx, vuid_serverinfo);
+                result = copy_session_info(mem_ctx, session_info);
                if (result == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }