* sign.c (sign_file): Do not push textmode filter onto an unopened IOBUF

(segfault).  Noted by Marcus Brinkmann.  Push and reinitialize textmode
filter for each file in a multiple file list.

* packet.h, getkey.c (fixup_uidnode), keyedit.c (show_prefs): Set and show
the keyserver no-modify flag.

* keygen.c (add_keyserver_modify): New. (keygen_upd_std_prefs): Call it
here. (keygen_set_std_prefs): Accept "ks-modify" and "no-ks-modify" as
prefs to set and unset keyserver modify flag.

1 files changed, 18 insertions, 3 deletions

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 9a7d1f2a7..e34ee3aaa 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1694,9 +1694,22 @@ show_prefs (PKT_user_id *uid, int verbose)
 	    }
 	    tty_printf ("%s",compress_algo_to_string(0));
         }
-        tty_printf ("\n     Features: ");
-	if(uid->mdc_feature)
-	  tty_printf ("MDC");
+	if(uid->mdc_feature || !uid->ks_modify)
+	  {
+	    tty_printf ("\n     Features: ");
+	    any=0;
+	    if(uid->mdc_feature)
+	      {
+		tty_printf ("MDC");
+		any=1;
+	      }
+	    if(!uid->ks_modify)
+	      {
+		if(any)
+		  tty_printf (", ");
+		tty_printf ("Keyserver no-modify");
+	      }
+	  }
 	tty_printf("\n");
     }
     else {
@@ -1709,6 +1722,8 @@ show_prefs (PKT_user_id *uid, int verbose)
         }
         if (uid->mdc_feature)
             tty_printf (" [mdc]");
+        if (!uid->ks_modify)
+            tty_printf (" [no-ks-modify]");
         tty_printf("\n");
     }
 }