From ecc02567a6901db57ff3e7e9010e83d54af5cfec Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Fri, 14 Jun 2002 17:42:47 +0000
Subject: [PATCH] * pkclist.c (expand_groups): Maintain the strlist flags while
 expanding. Members of an expansion inherit their flags from the expansion
 key.

* options.h, cipher.c (write_header), g10.c (main), keygen.c
(keygen_set_std_prefs): remove the personal_mdc flag.  It no longer serves
a purpose now that the personal preference lists are split into
cipher/digest/zip.
---
 g10/ChangeLog | 11 +++++++++++
 g10/cipher.c  |  2 +-
 g10/g10.c     |  1 -
 g10/keygen.c  |  2 --
 g10/options.h |  1 -
 g10/pkclist.c | 13 ++++++++++---
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 1c03c47a9..c4e1ba8a9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-14  David Shaw  <dshaw@jabberwocky.com>
+
+	* pkclist.c (expand_groups): Maintain the strlist flags while
+	expanding.  Members of an expansion inherit their flags from the
+	expansion key.
+
+	* options.h, cipher.c (write_header), g10.c (main), keygen.c
+	(keygen_set_std_prefs): remove the personal_mdc flag.  It no
+	longer serves a purpose now that the personal preference lists are
+	split into cipher/digest/zip.
+
 2002-06-14  Timo Schulz  <ts@winpt.org>
 
 	* skclist.c (is_insecure): Implemented.
diff --git a/g10/cipher.c b/g10/cipher.c
index 1f73e2923..2af8750c8 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -64,7 +64,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
     if (opt.force_mdc)
         use_mdc = 1;
         
-    if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc || !opt.personal_mdc )
+    if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc )
 	use_mdc = 0;  /* override - rfc2440 does not know about MDC */
 
     memset( &ed, 0, sizeof ed );
diff --git a/g10/g10.c b/g10/g10.c
index 26280bde0..6d6d78897 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -897,7 +897,6 @@ main( int argc, char **argv )
     opt.def_digest_algo = 0;
     opt.cert_digest_algo = 0;
     opt.def_compress_algo = -1;
-    opt.personal_mdc = 1; /* default - we like to use mdc if we can */
     opt.s2k_mode = 3; /* iterated+salted */
     opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
     opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
diff --git a/g10/keygen.c b/g10/keygen.c
index 30a236539..7a9e78bd2 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -344,8 +344,6 @@ keygen_set_std_prefs (const char *string,int personal)
 		    opt.personal_compress_prefs[i].value = 0;
 		  }
 	      }
-
-	    opt.personal_mdc = mdc;
 	  }
 	else
 	  {
diff --git a/g10/options.h b/g10/options.h
index 754c28611..74cebe575 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -133,7 +133,6 @@ struct {
     prefitem_t *personal_cipher_prefs,
                *personal_digest_prefs,
                *personal_compress_prefs;
-    int personal_mdc;
     int no_perm_warn;
     char *temp_dir;
     int no_encrypt_to;
diff --git a/g10/pkclist.c b/g10/pkclist.c
index a5dfa23bc..c56dc3cda 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -695,7 +695,7 @@ default_recipient(void)
 static STRLIST
 expand_groups(STRLIST input)
 {
-  STRLIST output=NULL,rover;
+  STRLIST sl,output=NULL,rover;
   struct groupitem *groups;
 
   for(rover=input;rover;rover=rover->next)
@@ -709,7 +709,11 @@ expand_groups(STRLIST input)
 
 	      /* maintain current utf8-ness */
 	      for(each=groups->values;each;each=each->next)
-		add_to_strlist(&output,each->d);
+		{
+		  sl=add_to_strlist(&output,each->d);
+		  /* maintain the flags from the original */
+		  sl->flags=each->flags;
+		}
 
 	      break;
 	    }
@@ -717,7 +721,10 @@ expand_groups(STRLIST input)
 
       /* Didn't find any groups, so use the existing string */
       if(!groups)
-	add_to_strlist(&output,rover->d);
+	{
+	  sl=add_to_strlist(&output,rover->d);
+	  sl->flags=rover->flags;
+	}
     }
 
   return output;