diff options
| author | Werner Koch <[email protected]> | 2007-08-24 09:34:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-08-24 09:34:39 +0000 |
| commit | 503f91e0aea99fe09064e29ec9df1ded1a3bd3c3 (patch) | |
| tree | e3dd4b252d6d05a5aa15aea799ab9447ea74ccbd /g10 | |
| parent | Add new features to kbxutil. (diff) | |
| download | gnupg-503f91e0aea99fe09064e29ec9df1ded1a3bd3c3.tar.gz gnupg-503f91e0aea99fe09064e29ec9df1ded1a3bd3c3.zip | |
tryu harder to ignore duplicate specified keyrings and -boxes.
Documentation updates.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/keyring.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index be41ada5a..90501d090 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2007-08-24 Werner Koch <[email protected]> + + * keyring.c (keyring_register_filename): Use same_file_p(). + 2007-08-21 Werner Koch <[email protected]> * misc.c (openpgp_md_test_algo): Remove rfc2440bis hash algorithms. diff --git a/g10/keyring.c b/g10/keyring.c index 67ac018c6..937502ab2 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -206,10 +206,10 @@ keyring_register_filename (const char *fname, int secret, void **ptr) for (kr=kr_names; kr; kr = kr->next) { - if ( !compare_filenames (kr->fname, fname) ) + if (same_file_p (kr->fname, fname)) { *ptr=kr; - return 0; /* already registered */ + return 0; /* Already registered. */ } } |