Further streamline & sanitize lead handling

- Never log anything from rpmLeadRead(), instead return an error message
  the callers can log if they see fit
- Add a return value for the lead type (which is the only bit of
  info from the lead we sometimes resort to using)
- Permit NULL pointers on all return values
- Eliminate rpmLeadCheck() and rpmLeadType() from the internal API,
  these are now combined into rpmLeadRead().
- Fix up the callers: only (re)signing needs the actual lead,
  signature verification only cares if its valid or not and
  package reading only wants the type from the lead (annoying but...)

1 files changed, 4 insertions, 10 deletions

diff --git a/sign/rpmgensig.c b/sign/rpmgensig.c
index 6b332541b..cd61b7af4 100644
--- a/sign/rpmgensig.c
+++ b/sign/rpmgensig.c
@@ -433,7 +433,7 @@ static int rpmSign(const char *rpm, int deleting, const char *passPhrase)
     rpmlead lead = NULL;
     char *sigtarget = NULL, *trpm = NULL;
     Header sigh = NULL;
-    char * msg;
+    char * msg = NULL;
     int res = -1; /* assume failure */
     rpmRC rc;
     struct rpmtd_s utd;
@@ -443,18 +443,12 @@ static int rpmSign(const char *rpm, int deleting, const char *passPhrase)
     if (manageFile(&fd, rpm, O_RDONLY))
 	goto exit;
 
-    if ((rc = rpmLeadRead(fd, &lead)) == RPMRC_OK) {
-	const char *lmsg = NULL;
-	rc = rpmLeadCheck(lead, &lmsg);
-	if (rc != RPMRC_OK) 
-	    rpmlog(RPMLOG_ERR, "%s: %s\n", rpm, lmsg);
-    }
-
-    if (rc != RPMRC_OK) {
+    if ((rc = rpmLeadRead(fd, &lead, NULL, &msg)) != RPMRC_OK) {
+	rpmlog(RPMLOG_ERR, "%s: %s\n", rpm, msg);
+	free(msg);
 	goto exit;
     }
 
-    msg = NULL;
     rc = rpmReadSignature(fd, &sigh, RPMSIGTYPE_HEADERSIG, &msg);
     switch (rc) {
     default: