X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;fp=merge.h;h=208c39bd0477cd8ae312c755c4f7571191bf0a4c;hb=8e58a1769ce5e492dd68904dfc81b6e077fc2a3a;hp=5abbeca15bdb3ae477ed6fd5b7069fba5bd3708b;hpb=4b8483ae278577a3adc8d84da81d77019704466f;p=onak.git

diff --git a/merge.h b/merge.h
index 5abbeca..208c39b 100644
--- a/merge.h
+++ b/merge.h
@@ -25,4 +25,16 @@
  */
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
+/**
+ *	update_keys - Takes a list of public keys and updates them in the DB.
+ *	@keys: The keys to update in the DB.
+ *
+ *	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.
+ */
+int update_keys(struct openpgp_publickey **keys);
+
 #endif