From 5d3b1b0dc06cca2a70f140d1245270c121f3db3b Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 12 Jan 2018 14:11:53 -0500
Subject: [PATCH] (fix) made sogo-tool manage-acl work on v2 (fixes #4292)

---
 NEWS                      | 7 +++++++
 Tools/SOGoToolManageACL.m | 9 +--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 9774cbae4..8608f5579 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2.3.24 (2018-XX-XX)
+-------------------
+
+Bug fixes
+ - sogo-tool manage-acl not working on v2 (#4292)
+
+
 2.3.23 (2017-10-18)
 -------------------
 
diff --git a/Tools/SOGoToolManageACL.m b/Tools/SOGoToolManageACL.m
index 9e2945548..8335110a1 100644
--- a/Tools/SOGoToolManageACL.m
+++ b/Tools/SOGoToolManageACL.m
@@ -294,14 +294,7 @@ typedef enum
       for (j = 0; j < [rights count]; j++)
 	{
 	  currentRole = [rights objectAtIndex: j];
-	  if ([GCSFolderManager singleStoreMode])
-	    SQL = [NSString stringWithFormat: @"INSERT INTO %@"
-			    @" (c_object, c_uid, c_role, c_folder_id)"
-			    @" VALUES ('/%@', '%@', '%@', %@)",
-			    [theFolder aclTableName],
-			    path, u, currentRole, [theFolder folderId]];
-	  else
-	    SQL = [NSString stringWithFormat: @"INSERT INTO %@"
+	  SQL = [NSString stringWithFormat: @"INSERT INTO %@"
 			    @" (c_object, c_uid, c_role)"
 			    @" VALUES ('/%@', '%@', '%@')",
 			    [theFolder aclTableName],