security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-18 00:49:50 +02:00
Code Activity

gpg: Mark more options as coming from the config file (when this holds)

Browse Source 
* g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
taken from the config file, note this.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Regression-due-to: 28311d1
This commit is contained in:
Neal H. Walfield 2015-12-17 10:44:55 +01:00
parent ee8a8ec1cf
commit 478ca6c75b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/gpg.c
View File

@ -3056,6 +3056,8 @@ main (int argc, char **argv)
case oDefaultKey: case oDefaultKey:
sl = add_to_strlist (&opt.def_secret_key, pargs.r.ret_str); sl = add_to_strlist (&opt.def_secret_key, pargs.r.ret_str);
sl->flags = (pargs.r_opt << PK_LIST_SHIFT); sl->flags = (pargs.r_opt << PK_LIST_SHIFT);
if (configfp)
sl->flags |= PK_LIST_CONFIG;
break; break;
case oDefRecipient: case oDefRecipient:
if( *pargs.r.ret_str ) if( *pargs.r.ret_str )
@ -3259,7 +3261,7 @@ main (int argc, char **argv)
sl->flags |= PK_LIST_CONFIG; sl->flags |= PK_LIST_CONFIG;
break; break;
case oEncryptToDefaultKey: case oEncryptToDefaultKey:
opt.encrypt_to_default_key = 1; opt.encrypt_to_default_key = configfp ? 2 : 1;
break; break;
case oRecipient: /* store the recipient */ case oRecipient: /* store the recipient */
sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings ); sl = add_to_strlist2( &remusr, pargs.r.ret_str, utf8_strings );
@ -4250,6 +4252,8 @@ main (int argc, char **argv)
sl = add_to_strlist2 (&remusr, default_key, utf8_strings); sl = add_to_strlist2 (&remusr, default_key, utf8_strings);
sl->flags = ((oEncryptToDefaultKey << PK_LIST_SHIFT) sl->flags = ((oEncryptToDefaultKey << PK_LIST_SHIFT)
| PK_LIST_ENCRYPT_TO); | PK_LIST_ENCRYPT_TO);
if (opt.encrypt_to_default_key == 2)
sl->flags |= PK_LIST_CONFIG;
} }
else if (have_def_secret_key) else if (have_def_secret_key)
log_info (_("option '%s' given, but no valid default keys given\n"), log_info (_("option '%s' given, but no valid default keys given\n"),