svn commit: samba r6317 - in trunk/source/smbd: .
jra at samba.org
jra at samba.org
Tue Apr 12 17:30:19 GMT 2005
Author: jra
Date: 2005-04-12 17:30:18 +0000 (Tue, 12 Apr 2005)
New Revision: 6317
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6317
Log:
Remove over-cautious asserts. Damn wish I'd made the release
with this....
Jeremy.
Modified:
trunk/source/smbd/posix_acls.c
Changeset:
Modified: trunk/source/smbd/posix_acls.c
===================================================================
--- trunk/source/smbd/posix_acls.c 2005-04-12 17:30:14 UTC (rev 6316)
+++ trunk/source/smbd/posix_acls.c 2005-04-12 17:30:18 UTC (rev 6317)
@@ -3878,11 +3878,15 @@
}
}
- /* If we get here we know ret == 0. */
- SMB_ASSERT(ret == 0);
+ /* If ret is -1 here we didn't match on the user entry or
+ supplemental group entries. */
+
+ DEBUG(10,("check_posix_acl_group_write: ret = %d before check_stat:\n", ret));
check_stat:
+ /* Do we match on the owning group entry ? */
+
for (i = 0; i < current_user.ngroups; i++) {
if (current_user.groups[i] == psbuf->st_gid) {
ret = (psbuf->st_mode & S_IWGRP) ? 1 : 0;
@@ -3893,14 +3897,15 @@
}
if (i == current_user.ngroups) {
- SMB_ASSERT(ret != 1);
DEBUG(10,("check_posix_acl_group_write: file %s \
-failed to match on user or group in token.\n", fname ));
+failed to match on user or group in token (ret = %d).\n", fname, ret ));
}
done:
SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+
+ DEBUG(10,("check_posix_acl_group_write: file %s returning (ret = %d).\n", fname, ret ));
return ret;
}
More information about the samba-cvs
mailing list