From: Thierry FOURNIER <tfournier@exceliance.fr>
Date: Wed, 29 Jan 2014 11:32:58 +0000 (+0100)
Subject: MINOR: pattern: Check if the file reference is not used with acl and map
X-Git-Tag: v1.5-dev23~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0bd9100ebd0b88fb24785db91d18950f1f9163b;p=thirdparty%2Fhaproxy.git

MINOR: pattern: Check if the file reference is not used with acl and map

The format of the acl file are not the same than the format of the map
files. In some case, the same file can be used, but this is ambiguous
for the user because the patterns are not the expected.
---

diff --git a/include/types/pattern.h b/include/types/pattern.h
index 99f68cd75e..bf13bf78f9 100644
--- a/include/types/pattern.h
+++ b/include/types/pattern.h
@@ -89,6 +89,7 @@ enum {
 
 #define PAT_REF_MAP 0x1 /* Set if the reference is used by at least one map. */
 #define PAT_REF_ACL 0x2 /* Set if the reference is used by at least one acl. */
+#define PAT_REF_SMP 0x4 /* Flag used if the reference contains a sample. */
 
 /* This struct contain a list of reference strings for dunamically
  * updatable patterns.
diff --git a/src/pattern.c b/src/pattern.c
index 7cab38930d..4a3b05ad46 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -1956,6 +1956,7 @@ int pattern_read_from_file(struct pattern_head *head, unsigned int refflags,
 		}
 
 		if (load_smp) {
+			ref->flags |= PAT_REF_SMP;
 			if (!pat_ref_read_from_file_smp(ref, filename, err))
 				return 0;
 		}
@@ -1965,7 +1966,32 @@ int pattern_read_from_file(struct pattern_head *head, unsigned int refflags,
 		}
 	}
 	else {
-		/* The reference already exists, Merge flags. */
+		/* The reference already exists, check the map compatibility. */
+
+		/* If the load require samples and the flag PAT_REF_SMP is not set,
+		 * the reference doesn't contain sample, and cannot be used.
+		 */
+		if (load_smp) {
+			if (!(ref->flags & PAT_REF_SMP)) {
+				memprintf(err, "The file \"%s\" is already used as one column file "
+				               "and cannot be used by as two column file.",
+				               filename);
+				return 0;
+			}
+		}
+		else {
+			/* The load doesn't require samples. If the flag PAT_REF_SMP is
+			 * set, the reference contains a sample, and cannot be used.
+			 */
+			if (ref->flags & PAT_REF_SMP) {
+				memprintf(err, "The file \"%s\" is already used as two column file "
+				               "and cannot be used by as one column file.",
+				               filename);
+				return 0;
+			}
+		}
+
+		/* Merge flags. */
 		ref->flags |= refflags;
 	}