Author: gd Date: 2004-11-03 00:32:08 +0000 (Wed, 03 Nov 2004) New Revision: 3496
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3496 Log: Fix calling of get_acl_group_bits(). Guenther Modified: branches/SAMBA_3_0/source/smbd/dosmode.c branches/SAMBA_3_0/source/smbd/posix_acls.c trunk/source/smbd/dosmode.c trunk/source/smbd/posix_acls.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/dosmode.c =================================================================== --- branches/SAMBA_3_0/source/smbd/dosmode.c 2004-11-03 00:29:09 UTC (rev 3495) +++ branches/SAMBA_3_0/source/smbd/dosmode.c 2004-11-03 00:32:08 UTC (rev 3496) @@ -344,7 +344,9 @@ return(-1); } - get_acl_group_bits(conn, fname, &st->st_mode); + if (!get_acl_group_bits(conn, fname, &st->st_mode)) { + return(-1); + } if (S_ISDIR(st->st_mode)) dosmode |= aDIR; Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c =================================================================== --- branches/SAMBA_3_0/source/smbd/posix_acls.c 2004-11-03 00:29:09 UTC (rev 3495) +++ branches/SAMBA_3_0/source/smbd/posix_acls.c 2004-11-03 00:32:08 UTC (rev 3496) @@ -3226,7 +3226,7 @@ } } SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl); - return -1; + return result; } /**************************************************************************** Modified: trunk/source/smbd/dosmode.c =================================================================== --- trunk/source/smbd/dosmode.c 2004-11-03 00:29:09 UTC (rev 3495) +++ trunk/source/smbd/dosmode.c 2004-11-03 00:32:08 UTC (rev 3496) @@ -344,7 +344,9 @@ return(-1); } - get_acl_group_bits(conn, fname, &st->st_mode); + if (!get_acl_group_bits(conn, fname, &st->st_mode)) { + return(-1); + } if (S_ISDIR(st->st_mode)) dosmode |= aDIR; Modified: trunk/source/smbd/posix_acls.c =================================================================== --- trunk/source/smbd/posix_acls.c 2004-11-03 00:29:09 UTC (rev 3495) +++ trunk/source/smbd/posix_acls.c 2004-11-03 00:32:08 UTC (rev 3496) @@ -3226,7 +3226,7 @@ } } SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl); - return -1; + return result; } /****************************************************************************