geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases 1 Wiki Activity

Don't add duplicate ACLs even when asked; just return success.

Browse Source
This commit is contained in:
alexhudson
2010-06-26 17:44:40 +00:00
parent 2ef00b9af1
commit 7db9dd7fce
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/store/object-model.c
+23 -1
View File
@@ -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;