diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-06-16 16:03:30 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-06-16 16:04:18 +0200 |
| commit | ba98e746e63d749ab2bf84c9e050206468019b7f (patch) | |
| tree | 93dc2324146562f905ad36478eaf09b8752d088b | |
| parent | Reset signal-mask on re-exec to init=.. (diff) | |
| download | systemd-ba98e746e63d749ab2bf84c9e050206468019b7f.tar.xz systemd-ba98e746e63d749ab2bf84c9e050206468019b7f.zip | |
bus-proxy: policy - ignore unsupported tags and attributes
| -rw-r--r-- | src/bus-proxyd/bus-policy.c | 17 | ||||
| -rw-r--r-- | src/bus-proxyd/bus-policy.h | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c index c23d394cb2..3f1d7557c1 100644 --- a/src/bus-proxyd/bus-policy.c +++ b/src/bus-proxyd/bus-policy.c @@ -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; } diff --git a/src/bus-proxyd/bus-policy.h b/src/bus-proxyd/bus-policy.h index bad4256a33..a6ff5c37f6 100644 --- a/src/bus-proxyd/bus-policy.h +++ b/src/bus-proxyd/bus-policy.h @@ -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; |