r3496: Fix calling of get_acl_group_bits().

Guenther
(This used to be commit 3acc74eef5dae16d7e2792206640904265c42494)

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 7199b3ebbf3e6d69daa8d7fd81d461631502def8..3a3a6e6fdb052fd94e993f80275cc3e43cc1a24e 100644 (file)
--- 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 66103fda5cd62ca66b7187d1a56be3d88669b767..be7f828b677d432ce5882a6ca464b1d19376835d 100644 (file)
--- 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;
 }
 
 /****************************************************************************