From 23b36f4e47f83e7cb92cea6f99fea41b782c94a5 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Wed, 11 Dec 2002 15:17:10 +0000
Subject: [PATCH] * mainproc.c (proc_tree): Handle multiple detached sigs
 concatenated together by warning the user and processing only the first.

* g10.c (main): Comment out --list-trust-path until it can be implemented.
---
 g10/ChangeLog  | 9 +++++++++
 g10/g10.c      | 3 ++-
 g10/mainproc.c | 7 +++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4568fcd78..463a8229a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-11  David Shaw  <dshaw@jabberwocky.com>
+
+	* mainproc.c (proc_tree): Handle multiple detached sigs
+	concatenated together by warning the user and processing only the
+	first.
+
+	* g10.c (main): Comment out --list-trust-path until it can be
+	implemented.
+
 2002-12-05  David Shaw  <dshaw@jabberwocky.com>
 
 	* keygen.c (ask_algo): Make the Elgamal sign+encrypt warning
diff --git a/g10/g10.c b/g10/g10.c
index d333bc675..16e9decdd 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -478,7 +478,8 @@ static ARGPARSE_OPTS opts[] = {
     { aExportOwnerTrust, "list-ownertrust",0 , "@"},  /* alias */
     { aPrintMDs, "print-mds" , 256, "@"}, /* old */
     { aListTrustDB, "list-trustdb",0 , "@"},
-    { aListTrustPath, "list-trust-path",0, "@"},
+    /* Not yet used */
+    /* { aListTrustPath, "list-trust-path",0, "@"}, */
     { aPipeMode,  "pipemode", 0, "@" },
     { oKOption, NULL,	 0, "@"},
     { oPasswdFD, "passphrase-fd",1, "@" },
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 0fc3a8546..7c635b78b 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1581,6 +1581,10 @@ proc_tree( CTX c, KBNODE node )
     else if( node->pkt->pkttype == PKT_SIGNATURE ) {
 	PKT_signature *sig = node->pkt->pkt.signature;
 
+	if(find_next_kbnode(node, PKT_SIGNATURE))
+	  log_info(_("WARNING: multiple signatures detected.  "
+		     "Only the first will be checked.\n"));
+
 	if( sig->sig_class != 0x00 && sig->sig_class != 0x01 )
 	    log_info(_("standalone signature of class 0x%02x\n"),
 						    sig->sig_class);
@@ -1641,8 +1645,7 @@ proc_tree( CTX c, KBNODE node )
 	else if (!opt.quiet)
 	    log_info(_("old style (PGP 2.x) signature\n"));
 
-	for( n1 = node; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )) )
-	    check_sig_and_print( c, n1 );
+	check_sig_and_print( c, node );
     }
     else {
         dump_kbnode (c->list);