Make keyd background itself by default

[onak.git] / keydb_keyd.c

diff --git a/keydb_keyd.c b/keydb_keyd.c
index 32cf0f020d23bb1075f3f5a6a5f4096c712df1b0..35d2dc4cab504d388a5e2d3e7bcd4cd693c6fa93 100644 (file)
--- a/keydb_keyd.c
+++ b/keydb_keyd.c
@@ -103,10 +103,23 @@ static void keyd_initdb(bool readonly)
  */
 static void keyd_cleanupdb(void)
 {
  */
 static void keyd_cleanupdb(void)
 {

+       int cmd = KEYD_CMD_CLOSE;
+
+       if (write(keyd_fd, &cmd, sizeof(cmd)) != sizeof(cmd)) {
+               logthing(LOGTHING_CRITICAL,
+                               "Couldn't send close cmd: %s (%d)",
+                               strerror(errno),
+                               errno);
+       }
+

        if (shutdown(keyd_fd, SHUT_RDWR) < 0) {
                logthing(LOGTHING_NOTICE, "Error shutting down socket: %d",
                                errno);
        }
        if (shutdown(keyd_fd, SHUT_RDWR) < 0) {
                logthing(LOGTHING_NOTICE, "Error shutting down socket: %d",
                                errno);
        }

+       if (close(keyd_fd) < 0) {
+               logthing(LOGTHING_NOTICE, "Error closing down socket: %d",
+                               errno);
+       }

        keyd_fd = -1;
 
        return;
        keyd_fd = -1;
 
        return;


@@ -188,6 +201,27 @@ static int keyd_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        return (count > 0) ? 1 : 0;
 }
 
        return (count > 0) ? 1 : 0;
 }
 

+/**
+*      delete_key - Given a keyid delete the key from storage.
+*      @keyid: The keyid to delete.
+*      @intrans: If we're already in a transaction.
+*
+*      This function deletes a public key from whatever storage mechanism we
+*      are using. Returns 0 if the key existed.
+*/
+static int keyd_delete_key(uint64_t keyid, bool intrans)
+{
+       int cmd = KEYD_CMD_DELETE;
+
+       write(keyd_fd, &cmd, sizeof(cmd));
+       read(keyd_fd, &cmd, sizeof(cmd));
+       if (cmd == KEYD_REPLY_OK) {
+               write(keyd_fd, &keyid, sizeof(keyid));
+       }
+
+       return 0;
+}
+

 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.


@@ -215,7 +249,7 @@ static int keyd_store_key(struct openpgp_publickey *publickey, bool intrans,
        keyid = get_keyid(publickey);
        
        if (update) {
        keyid = get_keyid(publickey);
        
        if (update) {

-               delete_key(keyid, false);
+               keyd_delete_key(keyid, false);

        }
 
        write(keyd_fd, &cmd, sizeof(cmd));
        }
 
        write(keyd_fd, &cmd, sizeof(cmd));


@@ -247,27 +281,6 @@ static int keyd_store_key(struct openpgp_publickey *publickey, bool intrans,
        return 0;
 }
 
        return 0;
 }
 

-/**
- *     delete_key - Given a keyid delete the key from storage.
- *     @keyid: The keyid to delete.
- *     @intrans: If we're already in a transaction.
- *
- *     This function deletes a public key from whatever storage mechanism we
- *     are using. Returns 0 if the key existed.
- */
-static int keyd_delete_key(uint64_t keyid, bool intrans)
-{
-       int cmd = KEYD_CMD_DELETE;
-
-       write(keyd_fd, &cmd, sizeof(cmd));
-       read(keyd_fd, &cmd, sizeof(cmd));
-       if (cmd == KEYD_REPLY_OK) {
-               write(keyd_fd, &keyid, sizeof(keyid));
-       }
-       
-       return 0;
-}
-

 /**
  *     fetch_key_text - Trys to find the keys that contain the supplied text.
  *     @search: The text to search for.
 /**
  *     fetch_key_text - Trys to find the keys that contain the supplied text.
  *     @search: The text to search for.