* build-packet.c (build_sig_subpkt): Comments.

* exec.c (exec_write): Cast NULL to void* to properly terminate varargs
list.

* keyedit.c (show_key_with_all_names): Just for safety, catch an invalid
pk algorithm.

* sign.c (make_keysig_packet): Crucial that the call to mksubpkt comes
LAST before the calls to finalize the sig as that makes it possible for
the mksubpkt function to get a reliable pointer to the subpacket area.

* pkclist.c (do_we_trust_pre): If an untrusted key was chosen by a
particular user ID, use that ID as the one to ask about when prompting
whether to use the key anyway. (build_pk_list): Similar change here when
adding keys to the recipient list.

* trustdb.c (update_validity): Fix bug that prevented more than one
validity record per trust record. (get_validity): When retrieving validity
for a (user) supplied user ID, return the validity for that user ID only,
and do not fall back to the general key validity. (validate_one_keyblock):
Some commentary on whether non-self-signed user IDs belong in the web of
trust (arguably, they do).

1 files changed, 2 insertions, 3 deletions

diff --git a/g10/exec.c b/g10/exec.c
index fd592e853..0278438f6 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -417,14 +417,14 @@ int exec_write(struct exec_info **info,const char *program,
 	      if(DBG_EXTPROG)
 		log_debug("execlp: %s\n",program);
 
-	      execlp(program,program,NULL);
+	      execlp(program,program,(void *)NULL);
 	    }
 	  else
 	    {
 	      if(DBG_EXTPROG)
 		log_debug("execlp: %s -c %s\n",shell,(*info)->command);
 
-	      execlp(shell,shell,"-c",(*info)->command,NULL);
+	      execlp(shell,shell,"-c",(*info)->command,(void *)NULL);
 	    }
 
 	  /* If we get this far the exec failed.  Clean up and return. */
@@ -617,4 +617,3 @@ int exec_finish(struct exec_info *info)
   return ret;
 }
 #endif /* ! NO_EXEC */
-