shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

bus-proxy: policy - ignore unsupported tags and attributes

Browse Source
This commit is contained in:
Kay Sievers 2014-06-16 16:03:30 +02:00
parent 5a85ca1cb6
commit ba98e746e6
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bus-proxyd/bus-policy.c
View File

@ -155,7 +155,10 @@ static int file_load(Policy *p, const char *path) {
else if (streq(name, "group"))
state = STATE_POLICY_GROUP;
else {
log_warning("Attribute %s of <policy> tag unknown at %s:%u, ignoring.", name, path, line);
if (streq(name, "at_console"))
log_debug("Attribute %s of <policy> tag unsupported at %s:%u, ignoring.", name, path, line);
else
log_warning("Attribute %s of <policy> tag unknown at %s:%u, ignoring.", name, path, line);
state = STATE_POLICY_OTHER_ATTRIBUTE;
}
} else if (t == XML_TAG_CLOSE_EMPTY ||
@ -268,7 +271,12 @@ static int file_load(Policy *p, const char *path) {
ic = POLICY_ITEM_USER;
else if (streq(name, "group"))
ic = POLICY_ITEM_GROUP;
else {
else if (streq(name, "eavesdrop")) {
log_debug("Unsupported attribute %s= at %s:%u, ignoring.", name, path, line);
i->class = POLICY_ITEM_IGNORE;
state = STATE_ALLOW_DENY_OTHER_ATTRIBUTE;
break;
} else {
log_error("Unknown attribute %s= at %s:%u, ignoring.", name, path, line);
state = STATE_ALLOW_DENY_OTHER_ATTRIBUTE;
break;
@ -303,7 +311,10 @@ static int file_load(Policy *p, const char *path) {
(streq(u, "sender") && ic == POLICY_ITEM_RECV))
state = STATE_ALLOW_DENY_NAME;
else {
log_error("Unknown attribute %s= at %s:%u, ignoring.", name, path, line);
if (streq(u, "requested_reply"))
log_debug("Unsupported attribute %s= at %s:%u, ignoring.", name, path, line);
else
log_error("Unknown attribute %s= at %s:%u, ignoring.", name, path, line);
state = STATE_ALLOW_DENY_OTHER_ATTRIBUTE;
break;
}

1
src/bus-proxyd/bus-policy.h
View File

@ -42,6 +42,7 @@ typedef enum PolicyItemClass {
POLICY_ITEM_OWN_PREFIX,
POLICY_ITEM_USER,
POLICY_ITEM_GROUP,
POLICY_ITEM_IGNORE,
_POLICY_ITEM_CLASS_MAX,
_POLICY_ITEM_CLASS_INVALID = -1,
} PolicyItemClass;