* keyring.h, keyring.c (keyring_register_filename): Return the pointer if

a given keyring is registered twice.

* keydb.h, keydb.c (keydb_add_resource): Use flags to indicate a default
keyring. (keydb_locate_writable): Prefer the default keyring if possible.

* g10.c (main): Add --default-keyring option.

1 files changed, 6 insertions, 1 deletions

diff --git a/g10/keydb.h b/g10/keydb.h
index ebb63a4ba..c4b12dde5 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -143,7 +143,12 @@ struct keydb_search_desc {
 };
 
 /*-- keydb.c --*/
-int keydb_add_resource (const char *url, int force, int secret);
+
+/*
+  Flag 1 == force
+  Flag 2 == default
+*/
+int keydb_add_resource (const char *url, int flags, int secret);
 KEYDB_HANDLE keydb_new (int secret);
 void keydb_release (KEYDB_HANDLE hd);
 const char *keydb_get_resource_name (KEYDB_HANDLE hd);