* import.c (import_one): Show the keyid when giving the Elgamal slow
authorDavid Shaw <dshaw@jabberwocky.com>
Tue, 14 Oct 2003 23:30:14 +0000 (23:30 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Tue, 14 Oct 2003 23:30:14 +0000 (23:30 +0000)
import warning.

* g10.c (main): Older versions used --comment "" to indicate no comment.
Don't add an empty comment.

g10/ChangeLog
g10/g10.c
g10/import.c

index 2e1149c..2c506c0 100644 (file)
@@ -1,3 +1,11 @@
+2003-10-14  David Shaw  <dshaw@jabberwocky.com>
+
+       * import.c (import_one): Show the keyid when giving the Elgamal
+       slow import warning.
+
+       * g10.c (main): Older versions used --comment "" to indicate no
+       comment.  Don't add an empty comment.
+
 2003-10-13  David Shaw  <dshaw@jabberwocky.com>
 
        * keyedit.c (show_key_with_all_names): Ownertrust is only
index 5dff576..60a6aae 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1658,7 +1658,10 @@ main( int argc, char **argv )
            break;
          case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break;
          case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break;
-         case oComment: add_to_strlist(&opt.comments,pargs.r.ret_str); break;
+         case oComment:
+           if(pargs.r.ret_str[0])
+             add_to_strlist(&opt.comments,pargs.r.ret_str);
+           break;
          case oDefaultComment:
            deprecated_warning(configname,configlineno,
                               "--default-comment","--no-comments","");
index 8d94c39..80b4f67 100644 (file)
@@ -560,8 +560,8 @@ import_one( const char *fname, KBNODE keyblock,
     uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
 
     if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
-      log_info(_("NOTE: Elgamal primary key detected - "
-                "this may take some time to import\n"));
+      log_info(_("key %08lX: Elgamal primary key -"
+                " this may take some time to import\n"),(ulong)keyid[1]);
 
     if( opt.verbose && !opt.interactive ) {
        log_info( "pub  %4u%c/%08lX %s   ",