* photoid.c (get_default_photo_command, show_photos): Honor

FIXED_PHOTO_VIEWER and DISABLE_PHOTO_VIEWER.

* mainproc.c (check_sig_and_print): Use --show-photos to show photos when
verifying a sig made by a key with a photo.

* keyserver.c (parse_keyserver_uri): Properly parse a URI with no :port
section and an empty file path, but with a terminating '/'.
(keyserver_work): Honor DISABLE_KEYSERVER_HELPERS.

* hkp.c (hkp_ask_import): Display keyserver URI as a URI, but only if
verbose.

* exec.c, g10.c: USE_EXEC_PATH -> FIXED_EXEC_PATH

1 files changed, 8 insertions, 0 deletions

diff --git a/g10/mainproc.c b/g10/mainproc.c
index d70003380..f5c1dfe9a 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -38,6 +38,7 @@
 #include "i18n.h"
 #include "trustdb.h"
 #include "keyserver-internal.h"
+#include "photoid.h"
 
 
 struct kidlist_item {
@@ -1396,7 +1397,10 @@ check_sig_and_print( CTX c, KBNODE node )
         /* If we have a good signature and already printed 
          * the primary user ID, print all the other user IDs */
         if ( count && !rc ) {
+	    PKT_public_key *pk=NULL;
             for( un=keyblock; un; un = un->next ) {
+	        if(un->pkt->pkttype==PKT_PUBLIC_KEY)
+  		    pk=un->pkt->pkt.public_key;
                 if( un->pkt->pkttype != PKT_USER_ID )
                     continue;
                 if ( un->pkt->pkt.user_id->is_revoked )
@@ -1408,6 +1412,10 @@ check_sig_and_print( CTX c, KBNODE node )
 		     !un->pkt->pkt.user_id->attrib_data )
 		    continue;
 
+		if(opt.show_photos && un->pkt->pkt.user_id->attrib_data)
+		  show_photos(un->pkt->pkt.user_id->attribs,
+			      un->pkt->pkt.user_id->numattribs,pk,NULL);
+
 		log_info(    _("                aka \""));
                 print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
                                                  un->pkt->pkt.user_id->len );