From 7db9dd7fce77f9e2a113867c303ef90cf95de065 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Sat, 26 Jun 2010 17:44:40 +0000
Subject: [PATCH] Don't add duplicate ACLs even when asked; just return
 success.

---
 src/agents/store/object-model.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/agents/store/object-model.c b/src/agents/store/object-model.c
index 1a178f4..3ec8653 100644
--- a/src/agents/store/object-model.c
+++ b/src/agents/store/object-model.c
@@ -1473,6 +1473,27 @@ StoreObjectAddACL(StoreClient *client, StoreObject *object, StorePrincipalType p
 	
 	MsgSQLBeginTransaction(client->storedb);
 	
+	// check that this doesn't already exist
+	query = "SELECT count(priv) FROM accesscontrols WHERE guid = ?1 AND priv = ?2 AND principal = ?3 AND deny = ?4 AND who = ?5;";
+	
+	ret = MsgSQLPrepare(client->storedb, query, &stmt);
+	if (ret == NULL) goto abort;
+	
+	MsgSQLBindInt64(&stmt, 1, object->guid);
+	MsgSQLBindInt(&stmt, 2, priv);
+	MsgSQLBindInt(&stmt, 3, principal);
+	MsgSQLBindInt(&stmt, 4, deny? 1 : 0);
+	MsgSQLBindString(&stmt, 5, who, FALSE);
+	
+	status = MsgSQLResults(client->storedb, &stmt);
+	if (status) {
+		int count = MsgSQLResultInt(&stmt, 0);
+		if (count > 0) goto done;
+	}
+	
+	MsgSQLFinalize(&stmt);
+	
+	// now insert the new ACL
 	query = "INSERT INTO accesscontrols (guid, priv, principal, deny, who) VALUES (?1, ?2, ?3, ?4, ?5);";
 	
 	ret = MsgSQLPrepare(client->storedb, query, &stmt);
@@ -1487,7 +1508,8 @@ StoreObjectAddACL(StoreClient *client, StoreObject *object, StorePrincipalType p
 	status = MsgSQLExecute(client->storedb, &stmt);
 	if (status != 0)
 		goto abort;
-	
+
+done:
 	MsgSQLFinalize(&stmt);
 	if (MsgSQLCommitTransaction(client->storedb))
 		goto abort;