summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2004-11-03 00:32:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:08 -0500
commit193e82b0563da1a5b913432953f236d36008ef34 (patch)
treec6330ff16f232d8a5cbb68e4aabe75d69295f557
parentc0e31dd4f53226386a3017c0a4f8401fab102851 (diff)
downloadsamba-193e82b0563da1a5b913432953f236d36008ef34.tar.gz
samba-193e82b0563da1a5b913432953f236d36008ef34.tar.bz2
samba-193e82b0563da1a5b913432953f236d36008ef34.zip
r3496: Fix calling of get_acl_group_bits().
Guenther (This used to be commit 3acc74eef5dae16d7e2792206640904265c42494)
-rw-r--r--source3/smbd/dosmode.c4
-rw-r--r--source3/smbd/posix_acls.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 7199b3ebbf..3a3a6e6fdb 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -344,7 +344,9 @@ int file_set_dosmode(connection_struct *conn, const char *fname, uint32 dosmode,
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;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 66103fda5c..be7f828b67 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3226,7 +3226,7 @@ int get_acl_group_bits( connection_struct *conn, const char *fname, mode_t *mode
}
}
SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
- return -1;
+ return result;
}
/****************************************************************************