Move mailsync functionality to the database backends.

Move the sending of key sync mails to the DB backend.

diff --git a/Makefile.in b/Makefile.in
index cab1f82efc658390b0329244440f9d4d0d1069e9..d9459c8e5c1ec305da9cf763786767ad17ce9073 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ exec_prefix ?= @exec_prefix@
 PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey
 CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o \
        keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \
 PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey
 CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o \
        keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \

-       log.o photoid.o wordlist.o cleanup.o merge.o
+       log.o photoid.o wordlist.o cleanup.o merge.o sendsync.o

 SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
        keyindex.c stats.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \
 SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \
        keyindex.c stats.c lookup.c add.c keydb_$(DBTYPE).c ll.c hash.c \
        gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \


@@ -32,7 +32,7 @@ else
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 
 KEYDB_OBJ = keydb_$(DBTYPE).o
 endif
 

-OBJS = stats.o sendsync.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)

 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf
 
 
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf
 


@@ -62,8 +62,8 @@ lookup: lookup.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS)
 
        $(CC) $(LDFLAGS) -o lookup lookup.o cleankey.o $(CORE_OBJS) \
                $(KEYDB_OBJ) $(LIBS)
 

-add: add.o cleankey.o sendsync.o $(CORE_OBJS) $(KEYDB_OBJ)
-       $(CC) $(LDFLAGS) -o add add.o cleankey.o sendsync.o \
+add: add.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
+       $(CC) $(LDFLAGS) -o add add.o cleankey.o \

                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
                $(CORE_OBJS) $(KEYDB_OBJ) $(LIBS)
 
 onak: onak.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)

diff --git a/add.c b/add.c
index 189444e294fb2d83af8869b3c943504c30fba810..46f5ecf1e926a1553e06320b15acc4b9e40ab65e 100644 (file)
--- a/add.c
+++ b/add.c
@@ -78,14 +78,15 @@ int main(int argc, char *argv[])
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        count);
 
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        count);
 

-                       count = update_keys(&keys);
+                       count = update_keys(&keys, true);

                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);

+

                        if (keys != NULL) {
                        if (keys != NULL) {

-                               sendkeysync(keys);

                                free_publickey(keys);
                                keys = NULL;
                        }
                                free_publickey(keys);
                                keys = NULL;
                        }

+                       

                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");
                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");

diff --git a/keydb.c b/keydb.c
index 16217823e543b4e0cc827aca6fbb58e660514421..b8bd316e8e3dcf01fbb4e0f1efc02efe7eb7997e 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -156,6 +156,7 @@ uint64_t getfullkeyid(uint64_t keyid)
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.

+ *     @sendsync: Should we send a sync mail to our peers.

  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is
  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is


@@ -163,7 +164,7 @@ uint64_t getfullkeyid(uint64_t keyid)
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  */
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  */

-int update_keys(struct openpgp_publickey **keys)
+int update_keys(struct openpgp_publickey **keys, bool sendsync)

 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;


@@ -215,6 +216,10 @@ int update_keys(struct openpgp_publickey **keys)
                intrans = false;
        }
 
                intrans = false;
        }
 

+       if (sendsync && keys != NULL) {
+               sendkeysync(keys);
+       }
+

        return newkeys;
 }
 #endif /* NEED_UPDATEKEYS */
        return newkeys;
 }
 #endif /* NEED_UPDATEKEYS */

diff --git a/keydb.h b/keydb.h
index ca2a8233cdefc3b01c6300aeb38ccaab9e894ba0..98cf34dd7fa11dbdad6ebe5ad08f8e254867ebd3 100644 (file)
--- a/keydb.h
+++ b/keydb.h
@@ -100,14 +100,18 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey);
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.

+ *     @sendsync: If we should send a keysync mail.

  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is
  *     update to contain the minimum set of updates required to get from what
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is
  *     update to contain the minimum set of updates required to get from what
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.

+ *
+ *     If sendsync is true then we send out a keysync mail to our sync peers
+ *     with the update.

  */
  */

-int update_keys(struct openpgp_publickey **keys);
+int update_keys(struct openpgp_publickey **keys, bool sendsync);

 
 /**
  *     keyid2uid - Takes a keyid and returns the primary UID for it.
 
 /**
  *     keyid2uid - Takes a keyid and returns the primary UID for it.

diff --git a/onak.c b/onak.c
index 7bd89190118f02c664a6e758ef766a74b45faf77..e79e565a79779c08218101ea0c806f3ccedf6011 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
 
                        initdb(false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
 
                        initdb(false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",

-                                       update_keys(&keys));
+                                       update_keys(&keys, false));

                        if (keys != NULL && update) {
                                flatten_publickey(keys,
                                        &packets,
                        if (keys != NULL && update) {
                                flatten_publickey(keys,
                                        &packets,