* options.h, g10.c (main), keyedit.c (keyedit_menu): Use --interactive
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 22 Jul 2005 12:52:34 +0000 (12:52 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 22 Jul 2005 12:52:34 +0000 (12:52 +0000)
to enable the uid walking when signing a key with no uids specified to
sign.

* keylist.c (list_keyblock_print): Fix silly typo.  Noted by Greg
Sabino Mullane.

g10/ChangeLog
g10/g10.c
g10/keyedit.c
g10/keylist.c
g10/options.h

index 5a9fa68..f43c18e 100644 (file)
@@ -1,3 +1,12 @@
+2005-07-22  David Shaw  <dshaw@jabberwocky.com>
+
+       * options.h, g10.c (main), keyedit.c (keyedit_menu): Use
+       --interactive to enable the uid walking when signing a key with no
+       uids specified to sign.
+
+       * keylist.c (list_keyblock_print): Fix silly typo.  Noted by Greg
+       Sabino Mullane.
+
 2005-07-20  David Shaw  <dshaw@jabberwocky.com>
 
        * keyserver.c (curl_can_handle): New.  Do a runtime check against
index a0e698c..ac36ded 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -346,7 +346,6 @@ enum cmd_and_opt_values
     oEnableProgressFilter,
     oMultifile,
     oKeyidFormat,
-    oNoInteractiveSelection,
     oLimitCardInsertTries,
 
     oReaderPort,
@@ -677,7 +676,6 @@ static ARGPARSE_OPTS opts[] = {
     { oEnableProgressFilter, "enable-progress-filter", 0, "@" },
     { oMultifile, "multifile", 0, "@" },
     { oKeyidFormat, "keyid-format", 2, "@" },
-    { oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
     { oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"},
 
     { oReaderPort, "reader-port",    2, "@"},
@@ -2545,10 +2543,6 @@ main (int argc, char **argv )
            else
              log_error("unknown keyid-format `%s'\n",pargs.r.ret_str);
            break;
-          case oNoInteractiveSelection:
-            opt.no_interactive_selection = 1;
-            break;
-
          case oLimitCardInsertTries: 
             opt.limit_card_insert_tries = pargs.r.ret_int; 
             break;
index 6b19de4..c058747 100644 (file)
@@ -1742,12 +1742,15 @@ keyedit_menu( const char *username, STRLIST locusr,
                                           _("Really sign all user IDs?"
                                             " (y/N) ")))
                 {
-                  if (opt.no_interactive_selection)
+                  if(opt.interactive)
+                   interactive=1;
+                 else
                     {
+                     tty_printf(_("Hint: Select the user IDs to sign\n"));
                       have_commands = 0;
                       break;
                     }
-                  interactive=1;
+
                 }
              /* What sort of signing are we doing? */
              if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig))
index 5a6ae90..4ea092f 100644 (file)
@@ -790,7 +790,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
        else if(pk->has_expired)
          {
            printf(" [");
-           printf(_("expired: %s)"),expirestr_from_pk(pk));
+           printf(_("expired: %s"),expirestr_from_pk(pk));
            printf("]");
          }
        else if(pk->expiredate)
index 45744e5..db5d5e7 100644 (file)
@@ -157,7 +157,6 @@ struct
   char *temp_dir;
   int no_encrypt_to;
   int interactive;
-  int no_interactive_selection;
   STRLIST sig_notation_data;
   STRLIST cert_notation_data;
   STRLIST sig_policy_url;