Verify file contexts from file security context patterns.

CVS patchset: 7005
CVS date: 2003/12/25 19:02:01

1 files changed, 17 insertions, 13 deletions

diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index b64ae1e70..36e5baf8c 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -120,16 +120,18 @@ typedef enum rpmVerifyAttrs_e {
     RPMVERIFY_MTIME	= (1 << 5),	/*!< from %verify(mtime) */
     RPMVERIFY_MODE	= (1 << 6),	/*!< from %verify(mode) */
     RPMVERIFY_RDEV	= (1 << 7),	/*!< from %verify(rdev) */
-	/* bits 8-15 unused, reserved for rpmVerifyAttrs */
-	/* bits 16-20 used in rpmVerifyFlags */
-	/* bits 21-22 unused */
+	/* bits 8-14 unused, reserved for rpmVerifyAttrs */
+    RPMVERIFY_CONTEXTS	= (1 << 15),	/*!< verify: from --nocontexts */
+	/* bits 16-22 used in rpmVerifyFlags */
 	/* bits 23-27 used in rpmQueryFlags */
-    RPMVERIFY_READLINKFAIL= (1 << 28),	/*!< */
-    RPMVERIFY_READFAIL	= (1 << 29),	/*!< */
-    RPMVERIFY_LSTATFAIL	= (1 << 30)	/*!< */
-	/* bit 31 unused */
+    RPMVERIFY_READLINKFAIL= (1 << 28),	/*!< readlink failed */
+    RPMVERIFY_READFAIL	= (1 << 29),	/*!< file read failed */
+    RPMVERIFY_LSTATFAIL	= (1 << 30),	/*!< lstat failed */
+    RPMVERIFY_LGETFILECONFAIL	= (1 << 31)	/*!< lgetfilecon failed */
 } rpmVerifyAttrs;
 #define	RPMVERIFY_ALL		~(RPMVERIFY_NONE)
+#define	RPMVERIFY_FAILURES	\
+  (RPMVERIFY_LSTATFAIL|RPMVERIFY_READFAIL|RPMVERIFY_READLINKFAIL|RPMVERIFY_LGETFILECONFAIL)
 
 /** \ingroup rpmcli
  * Bit(s) to control rpmQuery() operation, stored in qva_flags.
@@ -146,13 +148,14 @@ typedef enum rpmQueryFlags_e {
     QUERY_MTIME		= (1 << 5),	/*!< from --nomtime) */
     QUERY_MODE		= (1 << 6),	/*!< from --nomode) */
     QUERY_RDEV		= (1 << 7),	/*!< from --nodev */
-	/* bits 8-15 unused, reserved for rpmVerifyAttrs */
+	/* bits 8-14 unused, reserved for rpmVerifyAttrs */
+    QUERY_CONTEXTS	= (1 << 15),	/*!< verify: from --nocontexts */
     QUERY_FILES		= (1 << 16),	/*!< verify: from --nofiles */
     QUERY_DEPS		= (1 << 17),	/*!< verify: from --nodeps */
     QUERY_SCRIPT	= (1 << 18),	/*!< verify: from --noscripts */
     QUERY_DIGEST	= (1 << 19),	/*!< verify: from --nodigest */
     QUERY_SIGNATURE	= (1 << 20),	/*!< verify: from --nosignature */
-    QUERY_PATCHES	= (1 << 21),	/*!< placeholder (SuSE) */
+    QUERY_PATCHES	= (1 << 21),	/*!< verify: from --nopatches */
     QUERY_HDRCHK	= (1 << 22),	/*!< verify: from --nohdrchk */
 /*@=enummemuse@*/
     QUERY_FOR_LIST	= (1 << 23),	/*!< query:  from --list */
@@ -188,13 +191,14 @@ typedef enum rpmVerifyFlags_e {
     VERIFY_MTIME	= (1 << 5),	/*!< from --nomtime */
     VERIFY_MODE		= (1 << 6),	/*!< from --nomode */
     VERIFY_RDEV		= (1 << 7),	/*!< from --nodev */
-	/* bits 8-15 unused, reserved for rpmVerifyAttrs */
+	/* bits 8-14 unused, reserved for rpmVerifyAttrs */
+    VERIFY_CONTEXTS	= (1 << 15),	/*!< verify: from --nocontexts */
     VERIFY_FILES	= (1 << 16),	/*!< verify: from --nofiles */
     VERIFY_DEPS		= (1 << 17),	/*!< verify: from --nodeps */
     VERIFY_SCRIPT	= (1 << 18),	/*!< verify: from --noscripts */
     VERIFY_DIGEST	= (1 << 19),	/*!< verify: from --nodigest */
     VERIFY_SIGNATURE	= (1 << 20),	/*!< verify: from --nosignature */
-    VERIFY_PATCHES	= (1 << 21),	/*!< placeholder (SuSE) */
+    VERIFY_PATCHES	= (1 << 21),	/*!< verify: from --nopatches */
     VERIFY_HDRCHK	= (1 << 22),	/*!< verify: from --nohdrchk */
 /*@-enummemuse@*/
     VERIFY_FOR_LIST	= (1 << 23),	/*!< query:  from --list */
@@ -203,12 +207,12 @@ typedef enum rpmVerifyFlags_e {
     VERIFY_FOR_CONFIG	= (1 << 26),	/*!< query:  from --configfiles */
     VERIFY_FOR_DUMPFILES= (1 << 27)	/*!< query:  from --dump */
 /*@=enummemuse@*/
-	/* bits 28-30 used in rpmVerifyAttrs */
+	/* bits 28-31 used in rpmVerifyAttrs */
 } rpmVerifyFlags;
 
 #define	VERIFY_ATTRS	\
   ( VERIFY_MD5 | VERIFY_SIZE | VERIFY_LINKTO | VERIFY_USER | VERIFY_GROUP | \
-    VERIFY_MTIME | VERIFY_MODE | VERIFY_RDEV )
+    VERIFY_MTIME | VERIFY_MODE | VERIFY_RDEV | VERIFY_CONTEXTS )
 #define	VERIFY_ALL	\
   ( VERIFY_ATTRS | VERIFY_FILES | VERIFY_DEPS | VERIFY_SCRIPT | VERIFY_DIGEST |\
     VERIFY_SIGNATURE | VERIFY_HDRCHK )