caformat: don't mask out feature flags based on compile time options in public headers

The caxyz.h headers should really stay free of #ifdef-fery based on
compile time options, as it's the stuff that is supposed to become the
publicly installed library API headers.

Hence, let's define the feature bits unconditionally in the header in
all its most featureful flory, but then let's mask out what we can't
support internally.

This is a rework of #127

Author: poettering

src/caencoder.c

@@ -223,7 +223,7 @@ CaEncoder *ca_encoder_new(void) {
         if (!e)
                 return NULL;
 
-        assert_se(ca_feature_flags_normalize(CA_FORMAT_DEFAULT, &e->feature_flags) >= 0);
+        e->feature_flags = CA_FORMAT_DEFAULT & SUPPORTED_FEATURE_MASK;
         e->time_granularity = 1;
 
         return e;

src/caformat.h

@@ -154,9 +154,7 @@ enum {
                 CA_FORMAT_WITH_SUBVOLUME_RO|
                 CA_FORMAT_WITH_XATTRS|
                 CA_FORMAT_WITH_ACL|
-#if HAVE_SELINUX
                 CA_FORMAT_WITH_SELINUX|
-#endif
                 CA_FORMAT_WITH_FCAPS|
                 CA_FORMAT_WITH_QUOTA_PROJID,
 
@@ -204,9 +202,7 @@ enum {
                 CA_FORMAT_WITH_SUBVOLUME|
                 CA_FORMAT_WITH_SUBVOLUME_RO|
                 CA_FORMAT_WITH_ACL|
-#if HAVE_SELINUX
                 CA_FORMAT_WITH_SELINUX|
-#endif
                 CA_FORMAT_WITH_FCAPS|
                 CA_FORMAT_WITH_QUOTA_PROJID,
 
@@ -258,9 +254,7 @@ enum {
                 CA_FORMAT_WITH_SUBVOLUME_RO|
                 CA_FORMAT_WITH_XATTRS|
                 CA_FORMAT_WITH_ACL|
-#if HAVE_SELINUX
                 CA_FORMAT_WITH_SELINUX|
-#endif
                 CA_FORMAT_WITH_FCAPS|
                 CA_FORMAT_WITH_QUOTA_PROJID,
 

src/caseed.c

@@ -11,6 +11,7 @@
 #include "caformat.h"
 #include "calocation.h"
 #include "caseed.h"
+#include "def.h"
 #include "realloc-buffer.h"
 #include "rm-rf.h"
 #include "util.h"
@@ -63,7 +64,7 @@ CaSeed *ca_seed_new(void) {
 
         s->chunker = (CaChunker) CA_CHUNKER_INIT;
 
-        assert_se(ca_feature_flags_normalize(CA_FORMAT_DEFAULT, &s->feature_flags) >= 0);
+        s->feature_flags = CA_FORMAT_DEFAULT & SUPPORTED_FEATURE_MASK;
 
         return s;
 }

src/casync-tool.c

@@ -22,6 +22,7 @@
 #include "caremote.h"
 #include "castore.h"
 #include "casync.h"
+#include "def.h"
 #include "gc.h"
 #include "notify.h"
 #include "parse-util.h"
@@ -299,7 +300,7 @@ static int dump_with_flags(void) {
                 _cleanup_free_ char *s = NULL;
                 uint64_t flag = UINT64_C(1) << i;
 
-                if (!(flag & CA_FORMAT_WITH_MASK))
+                if (!(flag & SUPPORTED_WITH_MASK))
                         continue;
 
                 r = ca_with_feature_flags_format(flag, &s);
@@ -1268,7 +1269,7 @@ static int verb_make(int argc, char *argv[]) {
                         return log_error_errno(r, "Failed to set store: %m");
         }
 
-        r = load_feature_flags(s, operation == MAKE_BLOB_INDEX ? 0 : CA_FORMAT_WITH_MASK);
+        r = load_feature_flags(s, operation == MAKE_BLOB_INDEX ? 0 : SUPPORTED_WITH_MASK);
         if (r < 0)
                 return r;
 
@@ -1583,7 +1584,7 @@ static int verb_extract(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = load_feature_flags(s, CA_FORMAT_WITH_MASK);
+        r = load_feature_flags(s, SUPPORTED_WITH_MASK);
         if (r < 0)
                 return r;
 
@@ -2191,7 +2192,7 @@ static int verb_list(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = load_feature_flags(s, CA_FORMAT_WITH_MASK);
+        r = load_feature_flags(s, SUPPORTED_WITH_MASK);
         if (r < 0)
                 return r;
 
@@ -2500,7 +2501,7 @@ static int verb_digest(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = load_feature_flags(s, IN_SET(operation, DIGEST_BLOB, DIGEST_BLOB_INDEX) ? 0 : CA_FORMAT_WITH_MASK);
+        r = load_feature_flags(s, IN_SET(operation, DIGEST_BLOB, DIGEST_BLOB_INDEX) ? 0 : SUPPORTED_WITH_MASK);
         if (r < 0)
                 return r;
 

src/casync.c

@@ -184,7 +184,7 @@ CaSync *ca_sync_new_encode(void) {
                 return NULL;
 
         s->direction = CA_SYNC_ENCODE;
-        assert_se(ca_feature_flags_normalize(CA_FORMAT_DEFAULT, &s->feature_flags) >= 0);
+        s->feature_flags = CA_FORMAT_DEFAULT & SUPPORTED_FEATURE_MASK;
 
         return s;
 }

src/def.h

@@ -7,4 +7,12 @@
 
 #define BUFFER_SIZE (64U*1024U)
 
+#if HAVE_SELINUX
+#define SUPPORTED_FEATURE_MASK CA_FORMAT_FEATURE_FLAGS_MAX
+#else
+#define SUPPORTED_FEATURE_MASK (CA_FORMAT_FEATURE_FLAGS_MAX &~ CA_FORMAT_WITH_SELINUX)
+#endif
+
+#define SUPPORTED_WITH_MASK (CA_FORMAT_WITH_MASK & SUPPORTED_FEATURE_MASK)
+
 #endif