diff options
| author | jbj <devnull@localhost> | 2001-07-17 20:01:46 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-07-17 20:01:46 +0000 |
| commit | fe5362ef809874996febb2eb0aa89877ee1f74fd (patch) | |
| tree | 476d3a80f4b89132a6c6ae8b45332ada2241db29 /lib | |
| parent | bad8c7a9b243a1f72338dc04daba56a944149716 (diff) | |
| download | rpm-fe5362ef809874996febb2eb0aa89877ee1f74fd.tar.gz rpm-fe5362ef809874996febb2eb0aa89877ee1f74fd.tar.bz2 rpm-fe5362ef809874996febb2eb0aa89877ee1f74fd.zip | |
- python: "seal" immutable region for legacy headers in rhnUnload() .
- python: add poptmodule.so bindings.
CVS patchset: 4951
CVS date: 2001/07/17 20:01:46
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/verify.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/verify.c b/lib/verify.c index 84b9b94f2..4f7969247 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -347,11 +347,7 @@ int rpmVerifyDigest(Header h) rpmDigestUpdate(ctx, uh, uhc); rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1); - if (digest) { /* XXX can't happen */ - if (strcmp(hdigest, digest)) { - ec = 1; - } - } + ec = (digest == NULL || strcmp(hdigest, digest)) ? 1 : 0; digest = _free(digest); } @@ -572,7 +568,7 @@ int rpmVerify(QVA_t qva, rpmQVSources source, const char * arg) break; /*@fallthrough@*/ default: - if (rpmdbOpen(qva->qva_prefix, &rpmdb, O_RDONLY, 0644)) + if ((rc = rpmdbOpen(qva->qva_prefix, &rpmdb, O_RDONLY, 0644)) != 0) return 1; break; } |