From 503f91e0aea99fe09064e29ec9df1ded1a3bd3c3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 24 Aug 2007 09:34:39 +0000 Subject: tryu harder to ignore duplicate specified keyrings and -boxes. Documentation updates. --- g10/ChangeLog | 4 ++++ g10/keyring.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'g10') 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 + + * keyring.c (keyring_register_filename): Use same_file_p(). + 2007-08-21 Werner Koch * 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. */ } } -- cgit v1.2.3