diff options
| author | Werner Koch <wk@gnupg.org> | 1999-05-23 14:29:05 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-05-23 14:29:05 +0200 |
| commit | c7447e78e2abb1298fecb9861fe420109c91f14f (patch) | |
| tree | b7a7954789898fc3cac24f43cbd0d32ec139f9f2 /g10/g10.c | |
| parent | See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch (diff) | |
| download | gnupg2-c7447e78e2abb1298fecb9861fe420109c91f14f.tar.xz gnupg2-c7447e78e2abb1298fecb9861fe420109c91f14f.zip | |
See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner Koch
Diffstat (limited to 'g10/g10.c')
| -rw-r--r-- | g10/g10.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 ); |