summaryrefslogtreecommitdiff
path: root/source3/smbd/dosmode.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-11-25 23:25:42 +0000
committerJeremy Allison <jra@samba.org>2003-11-25 23:25:42 +0000
commit09a708815625f4c9e656cdbbf148a2ca2de73bc7 (patch)
treebe0b8ad6a5e6447864c67b23422f5907b9573e17 /source3/smbd/dosmode.c
parent3f0d0002ae4a5351ee01fcb6c0bb81b98273fac0 (diff)
downloadsamba-09a708815625f4c9e656cdbbf148a2ca2de73bc7.tar.gz
samba-09a708815625f4c9e656cdbbf148a2ca2de73bc7.tar.bz2
samba-09a708815625f4c9e656cdbbf148a2ca2de73bc7.zip
Patch from Jim McDonough for bug #802. Retrieve the correct ACL group bits
if the file has an ACL. Jeremy. (This used to be commit 7bf5ed30ce74ba658ca35059955748c1d8cbd6d2)
Diffstat (limited to 'source3/smbd/dosmode.c')
-rw-r--r--source3/smbd/dosmode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index f88964123e..fb72a2eafc 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -183,6 +183,7 @@ uint32 dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
/*******************************************************************
chmod a file - but preserve some bits
********************************************************************/
+
int file_chmod(connection_struct *conn,char *fname, uint32 dosmode,SMB_STRUCT_STAT *st)
{
SMB_STRUCT_STAT st1;
@@ -197,6 +198,8 @@ int file_chmod(connection_struct *conn,char *fname, uint32 dosmode,SMB_STRUCT_ST
return(-1);
}
+ get_acl_group_bits(conn, fname, &st->st_mode);
+
if (S_ISDIR(st->st_mode))
dosmode |= aDIR;
else