summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-01-15 10:49:07 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-25 05:24:19 +0100
commit0fbefbcb54eb0610d4cbd3579914f884d0ae6fa5 (patch)
tree808967ad4beb7c669cab3ea09348bfba25e2d575 /source3/smbd
parent2f7e7153020167ff695515001cec00f858e7754f (diff)
downloadsamba-0fbefbcb54eb0610d4cbd3579914f884d0ae6fa5.tar.gz
samba-0fbefbcb54eb0610d4cbd3579914f884d0ae6fa5.tar.bz2
samba-0fbefbcb54eb0610d4cbd3579914f884d0ae6fa5.zip
s3-auth rename vuid_serverinfo to session_info
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
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/service.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index f4f6e9a45b..b08811bab2 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -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;
}