diff options
Diffstat (limited to 'g10/g10maint.c')
| -rw-r--r-- | g10/g10maint.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/g10/g10maint.c b/g10/g10maint.c index c743bf9a3..3204aab2b 100644 --- a/g10/g10maint.c +++ b/g10/g10maint.c @@ -422,15 +422,17 @@ main( int argc, char **argv ) tty_printf("%s", strusage(15) ); } - if( !sec_nrings || default_keyring ) { /* add default secret rings */ - char *p = make_filename(opt.homedir, "secring.g10", NULL ); - add_secret_keyring(p); - m_free(p); - } - if( !nrings || default_keyring ) { /* add default ring */ - char *p = make_filename(opt.homedir, "pubring.g10", NULL ); - add_keyring(p); - m_free(p); + if( cmd != aDeArmor && cmd != aEnArmor ) { + if( !sec_nrings || default_keyring ) { /* add default secret rings */ + char *p = make_filename(opt.homedir, "secring.g10", NULL ); + add_secret_keyring(p); + m_free(p); + } + if( !nrings || default_keyring ) { /* add default ring */ + char *p = make_filename(opt.homedir, "pubring.g10", NULL ); + add_keyring(p); + m_free(p); + } } if( argc ) { |