summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-12-20 11:50:25 -0800
committerAndrew Bartlett <abartlet@samba.org>2013-01-09 15:28:23 +1100
commit310c4cac907877958f771c4933329560655f814c (patch)
treeeb595c811f6051145b091c96d3c45ba342daa945 /source3/smbd
parent5bffdac4ed3fa5477e025e871efff759aa0ee8d8 (diff)
downloadsamba-310c4cac907877958f771c4933329560655f814c.tar.gz
samba-310c4cac907877958f771c4933329560655f814c.tar.bz2
samba-310c4cac907877958f771c4933329560655f814c.zip
Start to tidy-up check_user_ok().
Now we have removed "security=share" we cannot be called with vuid == UID_FIELD_INVALID. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/uid.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 30c7154a14..2aa9fff34b 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -90,12 +90,11 @@ static bool check_user_ok(connection_struct *conn,
const struct auth_session_info *session_info,
int snum)
{
- bool valid_vuid = (vuid != UID_FIELD_INVALID);
unsigned int i;
bool readonly_share;
bool admin_user;
- if (valid_vuid) {
+ {
struct vuid_cache_entry *ent;
for (i=0; i<VUID_CACHE_SIZE; i++) {
@@ -145,7 +144,7 @@ static bool check_user_ok(connection_struct *conn,
session_info->info->domain_name,
NULL, session_info->security_token, lp_admin_users(snum));
- if (valid_vuid) {
+ {
struct vuid_cache_entry *ent =
&conn->vuid_cache.array[conn->vuid_cache.next_entry];