1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00

See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner Koch

This commit is contained in:
Werner Koch 1999-05-23 12:29:05 +00:00
parent 9131432b4d
commit c7447e78e2
22 changed files with 2650 additions and 2486 deletions

View file

@ -849,11 +849,11 @@ main( int argc, char **argv )
if( cmd != aDeArmor && cmd != aEnArmor
&& !(cmd == aKMode && argc == 2 ) ) {
if( !sec_nrings || default_keyring ) /* add default secret rings */
if( !sec_nrings && default_keyring ) /* add default secret rings */
add_keyblock_resource("secring.gpg", 0, 1);
for(sl = sec_nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 1 );
if( !nrings || default_keyring ) /* add default ring */
if( !nrings && default_keyring ) /* add default ring */
add_keyblock_resource("pubring.gpg", 0, 0);
for(sl = nrings; sl; sl = sl->next )
add_keyblock_resource( sl->d, 0, 0 );