Werner Koch
9dc355ad3a
gpg: Make sure to mark a duplicate registered keybox as primary.
...
* kbx/keybox-init.c (keybox_register_file): Change interface to return
the token even if the file has already been registered.
* g10/keydb.c (primary_keyring): Rename to primary_keydb.
(maybe_create_keyring_or_box): Change return type to gpg_error_t.
(keydb_add_resource): Ditto. s/rc/err/.
(keydb_add_resource): Mark an already registered as primary.
* sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
(keydb_add_resource): Ditto. s/rc/err/.
(keydb_add_resource): Adjust for changed keybox_register_file.
--
This change aligns the registering of keyboxes with those of
keyrings. This fixes a potential bug:
gpg --keyring foo.kbx --keyring bar.gpg --keyring foo.kbx
would have marked bar.gpg as primary resource and thus inserting new
keys there. The correct and now fixed behavior is to insert to
foo.kbx.
Signed-off-by: Werner Koch <wk@gnupg.org>
2016-01-13 10:43:33 +01:00
..
2016-01-12 10:32:20 +09:00
2015-03-16 20:14:58 +01:00
2016-01-08 10:33:19 +01:00
2015-12-24 14:15:58 +09:00
2016-01-08 10:33:19 +01:00
2015-10-05 17:52:28 +02:00
2016-01-07 19:09:16 +01:00
2011-12-01 11:09:02 +01:00
2016-01-12 10:32:20 +09:00
2016-01-12 10:32:20 +09:00
2016-01-12 10:32:20 +09:00
2015-08-25 15:26:33 +02:00
2014-06-30 09:12:48 +02:00
2016-01-12 10:32:20 +09:00
2015-08-20 14:16:22 +02:00
2014-01-29 20:35:05 +01:00
2015-12-04 16:39:10 +01:00
2015-12-23 20:06:49 +01:00
2014-10-31 14:21:34 +01:00
2015-08-06 17:00:41 +09:00
2016-01-12 10:32:20 +09:00
2015-01-22 12:06:11 +01:00
2007-07-04 19:49:40 +00:00
2016-01-08 20:37:25 +01:00
2014-11-13 12:01:42 +01:00
2015-05-01 13:58:18 +09:00
2016-01-11 11:41:49 +01:00
2015-02-04 09:15:34 +01:00
2016-01-08 17:22:32 +01:00
2015-11-14 09:13:02 +01:00
2015-02-04 09:15:34 +01:00
2015-11-17 12:50:22 +01:00
2012-06-05 19:29:22 +02:00
2016-01-07 19:09:16 +01:00
2014-11-13 17:01:17 +01:00
2016-01-13 10:43:33 +01:00
2016-01-11 11:41:49 +01:00
2016-01-06 08:45:01 +01:00
2016-01-07 19:09:16 +01:00
2016-01-07 19:09:16 +01:00
2015-12-03 12:18:32 +01:00
2016-01-09 11:28:42 +01:00
2015-11-17 14:53:05 +01:00
2015-10-06 20:31:43 +02:00
2015-12-12 18:19:35 +01:00
2016-01-08 17:22:32 +01:00
2015-12-04 07:36:14 +01:00
2015-11-17 14:53:03 +01:00
2016-01-12 10:32:20 +09:00
2014-10-09 10:56:25 +02:00
2015-12-15 13:40:10 +01:00
2015-10-05 19:48:47 +02:00
2000-07-31 08:04:16 +00:00
2015-12-21 20:56:29 +09:00
2015-10-05 19:48:47 +02:00
2016-01-08 15:16:12 +01:00
2016-01-06 08:48:44 +01:00
2015-08-16 12:54:04 -04:00
2014-04-17 21:44:09 +02:00
2010-04-23 11:36:59 +00:00
2015-12-22 15:03:56 +01:00
2015-11-17 12:50:22 +01:00
2014-01-30 18:48:37 +01:00
2015-11-17 12:50:22 +01:00
2016-01-12 10:32:20 +09:00
2015-11-04 13:19:52 +01:00
2000-07-31 08:04:16 +00:00
2015-12-03 12:18:32 +01:00
2011-02-04 12:57:53 +01:00
2008-12-12 08:54:50 +00:00
2015-02-11 10:28:25 +01:00
2016-01-07 19:09:16 +01:00
2015-04-06 13:07:09 +02:00
2016-01-12 10:42:48 +01:00
2016-01-06 08:42:07 +01:00
2015-12-22 15:03:56 +01:00
2015-11-17 12:50:22 +01:00
2015-10-29 10:10:39 +01:00
2015-12-03 12:18:32 +01:00
2015-11-17 14:53:03 +01:00
2015-09-02 15:08:57 +02:00
2015-12-03 12:18:32 +01:00
2011-02-04 12:57:53 +01:00
2015-06-04 18:08:26 +02:00
2016-01-07 19:09:16 +01:00
2015-06-04 18:08:26 +02:00
2015-11-17 12:50:22 +01:00
2016-01-06 08:49:45 +01:00
2016-01-12 10:32:20 +09:00
2016-01-07 19:09:16 +01:00
2015-11-13 16:42:59 +01:00
2015-11-19 15:48:01 +01:00
2016-01-07 19:09:16 +01:00
2015-10-21 13:45:47 +02:00
2015-01-22 12:06:11 +01:00
2014-01-29 17:45:05 +01:00