Make keyd background itself by default

[onak.git] / keydb_keyd.c

diff --git a/keydb_keyd.c b/keydb_keyd.c
index fac5548481af7e6fc82a6762744b6663ce4f029b..35d2dc4cab504d388a5e2d3e7bcd4cd693c6fa93 100644 (file)
--- a/keydb_keyd.c
+++ b/keydb_keyd.c
@@ -39,7 +39,7 @@ static int keyd_fd = -1;
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */
  *     this file are called in order to allow the DB to be initialized ready
  *     for access.
  */

-void initdb(bool readonly)
+static void keyd_initdb(bool readonly)

 {
        struct sockaddr_un sock;
        int                cmd = KEYD_CMD_UNKNOWN;
 {
        struct sockaddr_un sock;
        int                cmd = KEYD_CMD_UNKNOWN;


@@ -101,12 +101,25 @@ void initdb(bool readonly)
  *     This function should be called upon program exit to allow the DB to
  *     cleanup after itself.
  */
  *     This function should be called upon program exit to allow the DB to
  *     cleanup after itself.
  */

-void 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;


@@ -120,7 +133,7 @@ void cleanupdb(void)
  *     operations on the database to help speed it all up, or if we want
  *     something to only succeed if all relevant operations are successful.
  */
  *     operations on the database to help speed it all up, or if we want
  *     something to only succeed if all relevant operations are successful.
  */

-bool starttrans(void)
+static bool keyd_starttrans(void)

 {
        return true;
 }
 {
        return true;
 }


@@ -130,7 +143,7 @@ bool starttrans(void)
  *
  *     Ends a transaction.
  */
  *
  *     Ends a transaction.
  */

-void endtrans(void)
+static void keyd_endtrans(void)

 {
        return;
 }
 {
        return;
 }


@@ -146,7 +159,7 @@ void endtrans(void)
  *
  *      TODO: What about keyid collisions? Should we use fingerprint instead?
  */
  *
  *      TODO: What about keyid collisions? Should we use fingerprint instead?
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int keyd_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,

                bool intrans)
 {
        struct buffer_ctx           keybuf;
                bool intrans)
 {
        struct buffer_ctx           keybuf;


@@ -188,6 +201,27 @@ int 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.


@@ -202,7 +236,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
  *     TODO: Do we store multiple keys of the same id? Or only one and replace
  *     it?
  */
  *     TODO: Do we store multiple keys of the same id? Or only one and replace
  *     it?
  */

-int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
+static int keyd_store_key(struct openpgp_publickey *publickey, bool intrans,
+               bool update)

 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;
 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;


@@ -214,7 +249,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
        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));


@@ -246,27 +281,6 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
        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.
- */
-int 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.


@@ -275,7 +289,8 @@ int delete_key(uint64_t keyid, bool intrans)
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */
  *     This function searches for the supplied text and returns the keys that
  *     contain it.
  */

-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int keyd_fetch_key_text(const char *search,
+               struct openpgp_publickey **publickey)

 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;
 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;


@@ -327,7 +342,7 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
  *     This function maps a 32bit key id to the full 64bit one. It returns the
  *     full keyid. If the key isn't found a keyid of 0 is returned.
  */
  *     This function maps a 32bit key id to the full 64bit one. It returns the
  *     full keyid. If the key isn't found a keyid of 0 is returned.
  */

-uint64_t getfullkeyid(uint64_t keyid)
+static uint64_t keyd_getfullkeyid(uint64_t keyid)

 {
        int cmd = KEYD_CMD_GETFULLKEYID;
 
 {
        int cmd = KEYD_CMD_GETFULLKEYID;
 


@@ -341,21 +356,6 @@ uint64_t getfullkeyid(uint64_t keyid)
        return keyid;
 }
 
        return keyid;
 }
 

-/**
- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
- *
- *     Dumps the database into one or more files, which contain pure OpenPGP
- *     that can be reimported into onak or gpg. filenamebase provides a base
- *     file name for the dump; several files may be created, all of which will
- *     begin with this string and then have a unique number and a .pgp
- *     extension.
- */
-int dumpdb(char *filenamebase)
-{
-       return 0;
-}
-

 /**
  *     iterate_keys - call a function once for each key in the db.
  *     @iterfunc: The function to call.
 /**
  *     iterate_keys - call a function once for each key in the db.
  *     @iterfunc: The function to call.


@@ -367,8 +367,8 @@ int dumpdb(char *filenamebase)
  *
  *     Returns the number of keys we iterated over.
  */
  *
  *     Returns the number of keys we iterated over.
  */

-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
-               void *ctx)
+static int keyd_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)

 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;
 {
        struct buffer_ctx           keybuf;
        struct openpgp_packet_list *packets = NULL;


@@ -425,3 +425,20 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
 #define NEED_GETKEYSIGS 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"
 #define NEED_GETKEYSIGS 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"

+
+struct dbfuncs keydb_keyd_funcs = {
+       .initdb                 = keyd_initdb,
+       .cleanupdb              = keyd_cleanupdb,
+       .starttrans             = keyd_starttrans,
+       .endtrans               = keyd_endtrans,
+       .fetch_key              = keyd_fetch_key,
+       .fetch_key_text         = keyd_fetch_key_text,
+       .store_key              = keyd_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = keyd_delete_key,
+       .getkeysigs             = generic_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = generic_keyid2uid,
+       .getfullkeyid           = keyd_getfullkeyid,
+       .iterate_keys           = keyd_iterate_keys,
+};