From 70feddb1a975f72df3f59237b8cd2e1cc71a6b17 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Fri, 7 Mar 2008 10:09:45 +0000
Subject: [PATCH] Remove locking from cookie code. Opens bug #11214 for MsgLib.

---
 src/agents/store/cookie.c | 46 ++-------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/agents/store/cookie.c b/src/agents/store/cookie.c
index 9c59cc9..75d3a9e 100644
--- a/src/agents/store/cookie.c
+++ b/src/agents/store/cookie.c
@@ -32,29 +32,16 @@ CCode
 StoreCommandCOOKIENEW(StoreClient *client, uint64_t timeout)
 {
 	MsgAuthCookie cookie;
-	NLockStruct *lock = NULL;
 	CCode ccode = 0;
     
 	assert(STORE_PRINCIPAL_USER == client->principal.type);
-
-	if (NLOCK_ACQUIRED != ReadNLockAcquire(&lock, NULL, client->principal.name, 
-                                           STORE_ROOT_GUID, 2000))
-		return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-
-	if (NLOCK_ACQUIRED != PurgeNLockAcquire(lock, 2000)) {
-		ReadNLockRelease(lock);
-		return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-	}
 	
 	if (MsgAuthCreateCookie(client->principal.name, &cookie, timeout)) {
-		ccode = ConnWriteF(client->conn, "1000 %.32s\r\n", cookie.token);		
+		ccode = ConnWriteF(client->conn, "1000 %.32s\r\n", cookie.token);
 	} else {
                 ccode = ConnWriteStr(client->conn, MSG5004INTERNALERR);
 	}
 	
-	PurgeNLockRelease(lock);
-	ReadNLockRelease(lock);
-	
 	return ccode;
 }
 
@@ -63,29 +50,15 @@ CCode
 StoreCommandCOOKIEDELETE(StoreClient *client, const char *token)
 {
     CCode ccode = 0;
-    NLockStruct *lock = NULL;
 
     assert(STORE_PRINCIPAL_USER == client->principal.type);
 
-    if (NLOCK_ACQUIRED != ReadNLockAcquire(&lock, NULL, client->principal.name, 
-                                           STORE_ROOT_GUID, 2000))
-    {
-        return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-    }
-    if (NLOCK_ACQUIRED != PurgeNLockAcquire(lock, 2000)) {
-        ReadNLockRelease(lock);
-        return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-    }
-
     if (MsgAuthDeleteCookie(client->principal.name, token)) {
         ccode = ConnWriteStr(client->conn, MSG1000OK);
     } else {
         ccode = ConnWriteStr(client->conn, MSG5004INTERNALERR);
     }
-
-    PurgeNLockRelease(lock);
-    ReadNLockRelease(lock);
-
+    
     return ccode;
 }
 
@@ -133,7 +106,6 @@ CCode
 StoreCommandAUTHCOOKIE(StoreClient *client, char *user, char *token, int nouser)
 {
     CCode ccode;
-    NLockStruct *lock = NULL;
 //    struct sockaddr_in serv;
 
     if (StoreAgent.installMode) {
@@ -157,15 +129,6 @@ StoreCommandAUTHCOOKIE(StoreClient *client, char *user, char *token, int nouser)
         goto finish;
     }
 #endif
-    
-    if (NLOCK_ACQUIRED != ReadNLockAcquire(&lock, NULL, user, STORE_ROOT_GUID, 2000))
-    {
-        return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-    }
-    if (NLOCK_ACQUIRED != PurgeNLockAcquire(lock, 2000)) {
-        ReadNLockRelease(lock);
-        return ConnWriteStr(client->conn, MSG4120USERLOCKED);
-    }
 
     switch (MsgAuthFindCookie(user, token)) {
     case 0:
@@ -181,11 +144,6 @@ StoreCommandAUTHCOOKIE(StoreClient *client, char *user, char *token, int nouser)
     }
 
 finish:
-    if (lock) {
-        PurgeNLockRelease(lock);
-        ReadNLockRelease(lock);
-    }
-
     return ccode;
 }