From 193e82b0563da1a5b913432953f236d36008ef34 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 3 Nov 2004 00:32:08 +0000
Subject: r3496: Fix calling of get_acl_group_bits().

Guenther
(This used to be commit 3acc74eef5dae16d7e2792206640904265c42494)
---
 source3/smbd/dosmode.c    | 4 +++-
 source3/smbd/posix_acls.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

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;
 }
 
 /****************************************************************************
-- 
cgit