summaryrefslogtreecommitdiff
path: root/source3/smbd/dosmode.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-11-25 23:25:15 +0000
committerJeremy Allison <jra@samba.org>2003-11-25 23:25:15 +0000
commite88d4705c1a22636d0aa4dcf5c56e0d3f842da16 (patch)
tree93e79215b346e5b7e08f70f0de978c202014e945 /source3/smbd/dosmode.c
parent82ef4774d233295d29a3c6f86e30d03eddef9c73 (diff)
downloadsamba-e88d4705c1a22636d0aa4dcf5c56e0d3f842da16.tar.gz
samba-e88d4705c1a22636d0aa4dcf5c56e0d3f842da16.tar.bz2
samba-e88d4705c1a22636d0aa4dcf5c56e0d3f842da16.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 a51d9e947ef012fabf5a13250df6232d23722f68)
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