Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
5bd17b74
Commit
5bd17b74
authored
May 04, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change acl::NO_FAM (which should never happen) from a VSL record to VRT_Fail
parent
96b7bf52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
vsl_tags.h
include/tbl/vsl_tags.h
+6
-7
vcc_acl.c
lib/libvcc/vcc_acl.c
+2
-2
No files found.
include/tbl/vsl_tags.h
View file @
5bd17b74
...
@@ -289,16 +289,15 @@ SLTM(Fetch_Body, 0, "Body fetched from backend",
...
@@ -289,16 +289,15 @@ SLTM(Fetch_Body, 0, "Body fetched from backend",
SLTM
(
VCL_acl
,
0
,
"VCL ACL check results"
,
SLTM
(
VCL_acl
,
0
,
"VCL ACL check results"
,
"ACLs with the `+log` flag emits this record with the result.
\n\n
"
"ACLs with the `+log` flag emits this record with the result.
\n\n
"
"The format is::
\n\n
"
"The format is::
\n\n
"
"
\t
%s
[%s [%s [fixed: %s]
]]
\n
"
"
\t
%s
%s [%s [fixed: %s
]]
\n
"
"
\t
|
| | |
\n
"
"
\t
| | | |
\n
"
"
\t
|
| | +- Fixed entry (see vcc_acl_pedantic parameter)
\n
"
"
\t
| | | +- Fixed entry (see vcc_acl_pedantic parameter)
\n
"
"
\t
|
| +------------ Matching entry (only for MATCH)
\n
"
"
\t
| | +------------ Matching entry (only for MATCH)
\n
"
"
\t
|
+---------------- Name of the ACL for MATCH or NO_MATCH
\n
"
"
\t
|
+---------------- Name of the ACL
\n
"
"
\t
+-------------------- MATCH
, NO_MATCH or NO_FAM
\n
"
"
\t
+-------------------- MATCH
or NO_MATCH
\n
"
"
\n
"
"
\n
"
"MATCH denotes an ACL match
\n
"
"MATCH denotes an ACL match
\n
"
"NO_MATCH denotes that a checked ACL has not matched
\n
"
"NO_MATCH denotes that a checked ACL has not matched
\n
"
"NO_FAM denotes a missing address family and should not occur.
\n
"
"
\n
"
"
\n
"
)
)
...
...
lib/libvcc/vcc_acl.c
View file @
5bd17b74
...
@@ -586,8 +586,8 @@ vcc_acl_emit(struct vcc *tl, const struct symbol *sym)
...
@@ -586,8 +586,8 @@ vcc_acl_emit(struct vcc *tl, const struct symbol *sym)
Fh
(
tl
,
0
,
"
\n
"
);
Fh
(
tl
,
0
,
"
\n
"
);
Fh
(
tl
,
0
,
"
\t
fam = VRT_VSA_GetPtr(ctx, p, &a);
\n
"
);
Fh
(
tl
,
0
,
"
\t
fam = VRT_VSA_GetPtr(ctx, p, &a);
\n
"
);
Fh
(
tl
,
0
,
"
\t
if (fam < 0) {
\n
"
);
Fh
(
tl
,
0
,
"
\t
if (fam < 0) {
\n
"
);
if
(
tl
->
acl
->
flag_log
)
Fh
(
tl
,
0
,
"
\t\t
VRT_fail(ctx,"
);
Fh
(
tl
,
0
,
"
\t\t
VPI_acl_log(ctx,
\"
NO_FAM %s
\"
);
\n
"
,
sym
->
name
);
Fh
(
tl
,
0
,
"
\"
ACL %s: no protocol family
\"
);
\n
"
,
sym
->
name
);
Fh
(
tl
,
0
,
"
\t\t
return(0);
\n
"
);
Fh
(
tl
,
0
,
"
\t\t
return(0);
\n
"
);
Fh
(
tl
,
0
,
"
\t
}
\n\n
"
);
Fh
(
tl
,
0
,
"
\t
}
\n\n
"
);
if
(
!
tl
->
err_unref
)
{
if
(
!
tl
->
err_unref
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment