From: Michael Schroeder <mls@suse.de>
Date: Mon, 12 Apr 2010 10:09:04 +0000 (+0200)
Subject: Do not load keyring if signature checking is disabled.
X-Git-Tag: rpm-4.9.0-beta1~662
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cad147070e5513312d851f44998012e8f0cdf1e3;p=platform%2Fupstream%2Frpm.git

Do not load keyring if signature checking is disabled.
---

diff --git a/lib/package.c b/lib/package.c
index d1c73bd..90e4f9c 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -760,12 +760,16 @@ exit:
 rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 {
     rpmRC rc;
-    rpmKeyring keyring = rpmtsGetKeyring(ts, 1);
     rpmVSFlags vsflags = rpmtsVSFlags(ts);
+    rpmKeyring keyring = 0;
+
+    if ((vsflags & _RPMVSF_NOSIGNATURES) != _RPMVSF_NOSIGNATURES)
+	keyring = rpmtsGetKeyring(ts, 1);
 
     rc = rpmpkgRead(keyring, vsflags, fd, fn, hdrp);
 
-    rpmKeyringFree(keyring);
+    if (keyring)
+	rpmKeyringFree(keyring);
     return rc;
 }