From d3f7e48be949aca972ea3e67815dab6e6a994b41 Mon Sep 17 00:00:00 2001
From: ewt <devnull@localhost>
Date: Thu, 23 Jan 1997 20:55:33 +0000
Subject: [PATCH] added omitFlags to rpmVerifyFile()

CVS patchset: 1345
CVS date: 1997/01/23 20:55:33
---
 lib/rpmlib.h | 6 ++++--
 lib/verify.c | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 36b0406..9daeb38 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -229,10 +229,12 @@ int rpmInstallPackage(char * rootdir, rpmdb db, int fd, char * prefix,
 		      char * netsharedPath);
 int rpmVersionCompare(Header first, Header second);
 int rpmRemovePackage(char * prefix, rpmdb db, unsigned int offset, int test);
-int rpmVerifyFile(char * prefix, Header h, int filenum, int * result);
-int rpmVerifyScript(char * root, Header h, int err);
 int rpmdbRebuild(char * prefix);
 
+int rpmVerifyFile(char * prefix, Header h, int filenum, int * result, 
+		  int omitMask);
+int rpmVerifyScript(char * root, Header h, int err);
+
 typedef struct rpmDependencyCheck * rpmDependencies;
 
 struct rpmDependencyConflict {
diff --git a/lib/verify.c b/lib/verify.c
index f3214dd..b9d11b5 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -21,7 +21,8 @@
 static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:"
 			                 "/usr/X11R6/bin\nexport PATH\n";
 
-int rpmVerifyFile(char * prefix, Header h, int filenum, int * result) {
+int rpmVerifyFile(char * prefix, Header h, int filenum, int * result, 
+		  int omitMask) {
     char ** fileList, ** md5List, ** linktoList;
     int_32 * verifyFlags, flags;
     int_32 * sizeList, * mtimeList;
@@ -83,6 +84,9 @@ int rpmVerifyFile(char * prefix, Header h, int filenum, int * result) {
     else 
 	flags &= ~(RPMVERIFY_LINKTO);
 
+    /* Don't verify any features in omitMask */
+    flags &= ~omitMask;
+
     if (flags & RPMVERIFY_MD5) {
 	headerGetEntry(h, RPMTAG_FILEMD5S, &type, (void **) &md5List, &count);
 	if (useBrokenMd5) {
-- 
2.7.4