Commit 5bd17b74 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Change acl::NO_FAM (which should never happen) from a VSL record to VRT_Fail

parent 96b7bf52
...@@ -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"
) )
......
...@@ -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, "\tfam = VRT_VSA_GetPtr(ctx, p, &a);\n"); Fh(tl, 0, "\tfam = VRT_VSA_GetPtr(ctx, p, &a);\n");
Fh(tl, 0, "\tif (fam < 0) {\n"); Fh(tl, 0, "\tif (fam < 0) {\n");
if (tl->acl->flag_log) Fh(tl, 0, "\t\tVRT_fail(ctx,");
Fh(tl, 0, "\t\tVPI_acl_log(ctx, \"NO_FAM %s\");\n", sym->name); Fh(tl, 0, " \"ACL %s: no protocol family\");\n", sym->name);
Fh(tl, 0, "\t\treturn(0);\n"); Fh(tl, 0, "\t\treturn(0);\n");
Fh(tl, 0, "\t}\n\n"); Fh(tl, 0, "\t}\n\n");
if (!tl->err_unref) { if (!tl->err_unref) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment