[apparmor] [patch 03/12] This is the patch Im testing on top of patch 6 locally to address these
john.johansen at canonical.com
john.johansen at canonical.com
Tue Aug 26 00:06:08 UTC 2014
Signed-off-by: Steve Beattie <steve at nxnw.org>
Acked-by: John Johansen <john.johansen at canonical.com>
---
parser/af_rule.cc | 2 +-
parser/af_unix.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: b/parser/af_rule.cc
===================================================================
--- a/parser/af_rule.cc
+++ b/parser/af_rule.cc
@@ -80,7 +80,7 @@ int af_rule::move_base_cond(struct cond_
} else if (strcmp(ent->name, "protocol") == 0) {
yyerror("socket rule: 'protocol' conditional is not currently supported\n");
} else if (strcmp(ent->name, "label") == 0) {
- if (peer)
+ if (!peer)
move_conditional_value("unix", &label, ent);
else
move_conditional_value("unix", &peer_label, ent);
Index: b/parser/af_unix.cc
===================================================================
--- a/parser/af_unix.cc
+++ b/parser/af_unix.cc
@@ -350,7 +350,7 @@ int unix_rule::gen_policy_re(Profile &pr
/* peer addr */
if (peer_path) {
- if (strcmp(path, "none") == 0) {
+ if (strcmp(peer_path, "none") == 0) {
buffer << "\\x01";
} else {
/* skip leading @ */
More information about the AppArmor
mailing list