cscvs to tla changeset 124

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index 5abbeca15bdb3ae477ed6fd5b7069fba5bd3708b..3ec64f3ed98b824e5263e7b86b4e5eacec81a78b 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: merge.h,v 1.5 2003/06/04 20:57:11 noodles Exp $

  */
 
 #ifndef __MERGE_H__
  */
 
 #ifndef __MERGE_H__


@@ -25,4 +27,16 @@
  */
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
  */
 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
 #endif