summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-03-25 01:36:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:19 -0500
commit83c61f2ace4e07ed83bb4cd32b604e3819a363a8 (patch)
tree46d4f3855697a6b7b79cc89a64a825b3c225f26d /source3
parent1ca7ec3472e9cb77888f2850930f087b5e5bf761 (diff)
downloadsamba-83c61f2ace4e07ed83bb4cd32b604e3819a363a8.tar.gz
samba-83c61f2ace4e07ed83bb4cd32b604e3819a363a8.tar.bz2
samba-83c61f2ace4e07ed83bb4cd32b604e3819a363a8.zip
r6057: Don't put the assert in the wrong place :-).
Jeremy. (This used to be commit 6609b209f513f0859040686a88ee6c7106c06008)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/posix_acls.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 33db14aec3..0b95a03dcb 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3888,12 +3888,11 @@ match on group %u -> can write.\n", fname, (unsigned int)*pgid ));
}
}
-
- check_stat:
-
/* If we get here we know ret == 0. */
SMB_ASSERT(ret == 0);
+ check_stat:
+
for (i = 0; i < current_user.ngroups; i++) {
if (current_user.groups[i] == psbuf->st_gid) {
ret = (psbuf->st_mode & S_IWGRP) ? 1 : 0;
@@ -3904,7 +3903,7 @@ match on owning group %u -> %s.\n", fname, (unsigned int)psbuf->st_gid, ret ? "c
}
if (i == current_user.ngroups) {
- SMB_ASSERT(ret == 0);
+ SMB_ASSERT(ret != 1);
DEBUG(10,("check_posix_acl_group_write: file %s \
failed to match on user or group in token.\n", fname ));
}