sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3-auth rename vuid_serverinfo to session_info

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2012-01-15 10:49:07 +11:00
parent 2f7e715302
commit 0fbefbcb54
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/smbd/service.c
View File

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