[svn] GnuPG - r3966 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-12-14 15:52:04 +0100 (Wed, 14 Dec 2005)
New Revision: 3966

Modified:
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
Log:
* 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.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-12-14 09:55:40 UTC (rev 3965)
+++ trunk/g10/ChangeLog	2005-12-14 14:52:04 UTC (rev 3966)
@@ -1,3 +1,10 @@
+2005-12-14  David Shaw  <dshaw at 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 at jabberwocky.com>
 
 	* keyserver.c (keyserver_fetch): Switch on fast-import before we

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2005-12-14 09:55:40 UTC (rev 3965)
+++ trunk/g10/gpg.c	2005-12-14 14:52:04 UTC (rev 3966)
@@ -1693,7 +1693,6 @@
     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;