RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Thierry FOURNIER 2014-01-29 12:32:58 +01:00 committed by Willy Tarreau
parent 39bef456fb
commit c0bd9100eb
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/pattern.h
View File

@ -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.

28
src/pattern.c
View File

@ -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;
}