aboutsummaryrefslogtreecommitdiff
path: root/src/pies.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-10-14 00:39:19 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2009-10-14 00:39:19 +0300
commita37103f89c20e6b30d1f739233be006dcff340ee (patch)
tree6753527bfd7eba895eab8fa1811a706a9ffd482f /src/pies.c
parentc60e857d7f35128b077eac4a30a5900925bb38e8 (diff)
downloadpies-a37103f89c20e6b30d1f739233be006dcff340ee.tar.gz
pies-a37103f89c20e6b30d1f739233be006dcff340ee.tar.bz2
Fix ACL code.
* src/acl.c (pies_acl_create): Accept NULL name. (_parse_sockaddr): Fix calculation of netmask. (_acl_common_section_parser): New function. (acl_section_parser): Rewrite using _acl_common_section_parser. (defacl_section_parser): New function. (_check_sockaddr): Bugfix. (_acl_check): Break the loop when _check_sockaddr returns 1. (pies_acl_check): Break the loop when _acl_check_cb returns 1. * src/acl.h (defacl_section_parser): New prototype. * src/pies.c (component_keywords): New keyword defacl.
Diffstat (limited to 'src/pies.c')
-rw-r--r--src/pies.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/pies.c b/src/pies.c
index 3fcc529..d7d4ae1 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -796,8 +796,8 @@ struct grecs_keyword component_keywords[] = {
},
{"acl",
N_("name: string"),
- N_("Define ACL."),
- grecs_type_section, NULL, 0,
+ N_("Set ACL."),
+ grecs_type_section, NULL, offsetof (struct component, acl),
acl_section_parser, NULL, acl_keywords},
{"remove-file",
N_("file"),
@@ -1154,9 +1154,14 @@ struct grecs_keyword pies_keywords[] = {
return_code_section_parser, NULL, return_code_keywords},
{"acl",
N_("name: string"),
- N_("Define ACL."),
+ N_("Set global ACL."),
grecs_type_section, NULL, 0,
acl_section_parser, NULL, acl_keywords},
+ {"defacl",
+ N_("name: string"),
+ N_("Define an ACL."),
+ grecs_type_section, NULL, 0,
+ defacl_section_parser, NULL, acl_keywords},
{"include-meta1",
N_("file: string"),
N_("Include components from the specified MeTA1 configuration file."),

Return to:

Send suggestions and report system problems to the System administrator.