* sign.c (mk_notation_policy_etc): Capitalize "URL".

* trustdb.c (validate_keys): Give a little more information while
rebuilding trustdb.

* pkclist.c (do_edit_ownertrust): Clarify "don't know".

* g10.c (main): Default to --no-mangle-dos-filenames.

5 files changed, 19 insertions, 8 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index fbbf81fdb..c76124196 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,14 @@
 2003-09-23  David Shaw  <[email protected]>
 
+	* sign.c (mk_notation_policy_etc): Capitalize "URL".
+
+	* trustdb.c (validate_keys): Give a little more information while
+	rebuilding trustdb.
+
+	* pkclist.c (do_edit_ownertrust): Clarify "don't know".
+
+	* g10.c (main): Default to --no-mangle-dos-filenames.
+
 	* keydb.h, keyring.c (keyring_search), trustdb.c (search_skipfnc):
 	Expand the skipfnc to include a pointer to the user ID that
 	matched.
diff --git a/g10/g10.c b/g10/g10.c
index b1c8aa2c3..78b445fa7 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1181,7 +1181,7 @@ main( int argc, char **argv )
     opt.verify_options=
       VERIFY_SHOW_POLICY|VERIFY_SHOW_NOTATION|VERIFY_SHOW_KEYSERVER;
     opt.trust_model=TM_AUTO;
-    opt.mangle_dos_filenames = 1;
+    opt.mangle_dos_filenames = 0;
 #if defined (_WIN32)
     set_homedir ( read_w32_registry_string( NULL,
                                     "Software\\GNU\\GnuPG", "HomeDir" ));
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 0a94a259f..b11cda529 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -314,7 +314,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
                      "verify other users' keys (by looking at passports,\n"
                      "checking fingerprints from different sources...)?\n\n"));
 	if(min_num<=1)
-	  tty_printf (_(" %d = I don't know\n"), 1);
+	  tty_printf (_(" %d = I don't know or won't say\n"), 1);
 	if(min_num<=2)
 	  tty_printf (_(" %d = I do NOT trust\n"), 2);
 	if(min_num<=3)
diff --git a/g10/sign.c b/g10/sign.c
index 965234049..ab9d1a38f 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -155,7 +155,7 @@ mk_notation_policy_etc( PKT_signature *sig,
 	s=pct_expando(string,&args);
 	if(!s)
 	  {
-	    log_error(_("WARNING: unable to %%-expand policy url "
+	    log_error(_("WARNING: unable to %%-expand policy URL "
 			"(too large).  Using unexpanded.\n"));
 	    s=m_strdup(string);
 	  }
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 9e152a9c1..d8b02fb81 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1929,7 +1929,6 @@ validate_keys (int interactive)
   KEYDB_HANDLE kdb = NULL;
   KBNODE node;
   int depth;
-  int key_count;
   int ot_unknown, ot_undefined, ot_never, ot_marginal, ot_full, ot_ultimate;
   KeyHashTable stored,used,full_trust;
   u32 start_time, next_expire;
@@ -1989,8 +1988,9 @@ validate_keys (int interactive)
 
   for (depth=0; depth < opt.max_cert_depth; depth++)
     {
+      int valids=0,key_count;
       /* See whether we should assign ownertrust values to the keys in
-         utk_list.  */
+         klist.  */
       ot_unknown = ot_undefined = ot_never = 0;
       ot_marginal = ot_full = ot_ultimate = 0;
       for (k=klist; k; k = k->next)
@@ -2045,6 +2045,8 @@ validate_keys (int interactive)
             ot_full++;
           else if (k->ownertrust == TRUST_ULTIMATE)
             ot_ultimate++;
+
+	  valids++;
         }
 
       /* Find all keys which are signed by a key in kdlist */
@@ -2067,9 +2069,9 @@ validate_keys (int interactive)
       for (kar=keys; kar->keyblock; kar++)
           store_validation_status (depth, kar->keyblock, stored);
 
-      log_info (_("checking at depth %d valid=%d"
-                  " ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"), 
-                depth, key_count, ot_unknown, ot_undefined,
+      log_info (_("depth: %d  valid: %3d  signed: %3d"
+                  "  trust: %d-, %dq, %dn, %dm, %df, %du\n"), 
+                depth, valids, key_count, ot_unknown, ot_undefined,
                 ot_never, ot_marginal, ot_full, ot_ultimate ); 
 
       /* Build a new kdlist from all fully valid keys in KEYS */