From b31a707a95add749b375eb8f29fd294507ce3f42 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 7 Feb 2012 17:14:00 +0100
Subject: [PATCH] Implement the application enumeration and removal commands.

---
 src/servers/keystore/KeyStoreServer.cpp | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/servers/keystore/KeyStoreServer.cpp b/src/servers/keystore/KeyStoreServer.cpp
index f99f784cca..4d6c93b3c4 100644
--- a/src/servers/keystore/KeyStoreServer.cpp
+++ b/src/servers/keystore/KeyStoreServer.cpp
@@ -121,6 +121,8 @@ KeyStoreServer::MessageReceived(BMessage* message)
 		case KEY_STORE_REVOKE_ACCESS:
 		case KEY_STORE_ADD_KEYRING_TO_MASTER:
 		case KEY_STORE_REMOVE_KEYRING_FROM_MASTER:
+		case KEY_STORE_GET_NEXT_APPLICATION:
+		case KEY_STORE_REMOVE_APPLICATION:
 		{
 			BString keyringName;
 			if (message->FindString("keyring", &keyringName) != B_OK)
@@ -140,6 +142,8 @@ KeyStoreServer::MessageReceived(BMessage* message)
 				case KEY_STORE_ADD_KEY:
 				case KEY_STORE_REMOVE_KEY:
 				case KEY_STORE_ADD_KEYRING_TO_MASTER:
+				case KEY_STORE_GET_NEXT_APPLICATION:
+				case KEY_STORE_REMOVE_APPLICATION:
 				{
 					// These need keyring access to do anything.
 					while (!keyring->IsAccessible()) {
@@ -371,6 +375,44 @@ KeyStoreServer::MessageReceived(BMessage* message)
 			break;
 		}
 
+		case KEY_STORE_GET_NEXT_APPLICATION:
+		{
+			uint32 cookie;
+			if (message->FindUInt32("cookie", &cookie) != B_OK) {
+				result = B_BAD_VALUE;
+				break;
+			}
+
+			BString signature;
+			BString path;
+			result = keyring->GetNextApplication(cookie, signature, path);
+			if (result != B_OK)
+				break;
+
+			reply.AddUInt32("cookie", cookie);
+			reply.AddString("signature", signature);
+			reply.AddString("path", path);
+			result = B_OK;
+			break;
+		}
+
+		case KEY_STORE_REMOVE_APPLICATION:
+		{
+			const char* signature = NULL;
+			const char* path = NULL;
+
+			if (message->FindString("signature", &signature) != B_OK) {
+				result = B_BAD_VALUE;
+				break;
+			}
+
+			if (message->FindString("path", &path) != B_OK)
+				path = NULL;
+
+			result = keyring->RemoveApplication(signature, path);
+			break;
+		}
+
 		case 0:
 		{
 			// Just the error case from above.