aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-06-13 09:32:38 +0000
committerWerner Koch <[email protected]>2016-06-13 09:32:38 +0000
commit9e126af215143fddbdc3949681abb9ffdb9153bb (patch)
tree2d82194544dec75d54f5632ee99e3c8847273eda /g10/gpg.c
parentgpg: New option --disable-signer-uid, create Signer's UID sub-packet. (diff)
downloadgnupg-9e126af215143fddbdc3949681abb9ffdb9153bb.tar.gz
gnupg-9e126af215143fddbdc3949681abb9ffdb9153bb.zip
gpg: Un-deprecate option --auto-key-retrieve.
* g10/gpg.c (main): Remove deprecation warning. -- Most options for the keyserver have been moved to dirmngr and thus it does not make sense to favor "--keyserver-options auto-key-retrieve" over the direct options --auto-key-retrieve and --no-auto-key-retrieve. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index f6088f061..62e322783 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3150,12 +3150,6 @@ main (int argc, char **argv)
opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE;
else
opt.keyserver_options.options&=~KEYSERVER_AUTO_KEY_RETRIEVE;
-
- deprecated_warning(configname,configlineno,
- pargs.r_opt==oAutoKeyRetrieve?"--auto-key-retrieve":
- "--no-auto-key-retrieve","--keyserver-options ",
- pargs.r_opt==oAutoKeyRetrieve?"auto-key-retrieve":
- "no-auto-key-retrieve");
break;
case oShowSessionKey: opt.show_session_key = 1; break;
case oOverrideSessionKey: