diff options
author | Werner Koch <[email protected]> | 2007-01-30 20:16:28 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2007-01-30 20:16:28 +0000 |
commit | 7eec2efa66b55eab51e20d0fcc606763081d0024 (patch) | |
tree | 87dae67ea711626b9831caa374a3763ce2b7bf14 /g10/gpg.c | |
parent | jnlib/ (diff) | |
download | gnupg-7eec2efa66b55eab51e20d0fcc606763081d0024.tar.gz gnupg-7eec2efa66b55eab51e20d0fcc606763081d0024.zip |
Added LIBINTL to more Makefile targets.
doc/
* com-certs.pem: Added the current root certifcates of D-Trust and
S-Trust.
g10/
* status.c (write_status_begin_signing): New.
* sign.c (sign_file, sign_symencrypt_file): Call it.
* textfilter.c (copy_clearsig_text): Call it.
* call-agent.c (agent_scd_pksign): Pass --hash-rmd160 to SCD if
required.
* gpg.c (main): Let --no-use-agent and --gpg-agent-info print a
warning.
* misc.c (obsolete_option): New.
Diffstat (limited to '')
-rw-r--r-- | g10/gpg.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -2134,10 +2134,20 @@ main (int argc, char **argv ) opt.list_options|=LIST_SHOW_UNUSABLE_SUBKEYS; break; - case oBatch: opt.batch = 1; nogreeting = 1; break; + case oBatch: + opt.batch = 1; + nogreeting = 1; + break; + case oUseAgent: /* Dummy. */ - case oNoUseAgent: /* Dummy. */ break; - case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break; + break; + case oNoUseAgent: + obsolete_option (configname, configlineno, "--no-use-agent"); + break; + case oGpgAgentInfo: + obsolete_option (configname, configlineno, "--gpg-agent-info"); + break; + case oAnswerYes: opt.answer_yes = 1; break; case oAnswerNo: opt.answer_no = 1; break; case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break; |