* gpg.c (main): Don't default to import-options convert-sk-to-pk. It
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 14 Dec 2005 14:52:04 +0000 (14:52 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 14 Dec 2005 14:52:04 +0000 (14:52 +0000)
causes confusing warning messages when importing a PGP-exported key
that contains a secret key without selfsigs followed by the public
key.

g10/ChangeLog
g10/gpg.c

index 5cf4ab6..d0f1ffb 100644 (file)
@@ -1,3 +1,10 @@
+2005-12-14  David Shaw  <dshaw@jabberwocky.com>
+
+       * gpg.c (main): Don't default to import-options convert-sk-to-pk.
+       It causes confusing warning messages when importing a PGP-exported
+       key that contains a secret key without selfsigs followed by the
+       public key.
+
 2005-12-08  David Shaw  <dshaw@jabberwocky.com>
 
        * keyserver.c (keyserver_fetch): Switch on fast-import before we
index 81bf454..6d211de 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1693,7 +1693,6 @@ main (int argc, char **argv )
     opt.pgp2_workarounds = 1;
     opt.force_v3_sigs = 1;
     opt.escape_from = 1;
-    opt.import_options=IMPORT_SK2PK;
     opt.export_options=EXPORT_ATTRIBUTES;
     opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
     opt.keyserver_options.export_options=EXPORT_ATTRIBUTES;