diff options
| author | David Shaw <[email protected]> | 2002-11-08 03:31:21 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-08 03:31:21 +0000 |
| commit | 7911a5ed86925eb24ce2df962965ee3ee51c47ff (patch) | |
| tree | 48d3b2dd2a040e006f23ca40e001a5605706e5ed /g10/keyring.h | |
| parent | * options.h, g10.c (main), trustdb.c (ask_ownertrust): Add (diff) | |
| download | gnupg-7911a5ed86925eb24ce2df962965ee3ee51c47ff.tar.gz gnupg-7911a5ed86925eb24ce2df962965ee3ee51c47ff.zip | |
* 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.
Diffstat (limited to 'g10/keyring.h')
| -rw-r--r-- | g10/keyring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyring.h b/g10/keyring.h index cb8e404a4..1a6d1f976 100644 --- a/g10/keyring.h +++ b/g10/keyring.h @@ -26,7 +26,7 @@ typedef struct keyring_handle *KEYRING_HANDLE; -void *keyring_register_filename (const char *fname, int secret); +int keyring_register_filename (const char *fname, int secret, void **ptr); int keyring_is_writable (void *token); KEYRING_HANDLE keyring_new (void *token, int secret); |