apparmor/apparmor-fix-stl-ostream.diff

36 lines
1.1 KiB
Diff
Raw Normal View History

Index: parser/dbus.cc
===================================================================
--- parser/dbus.cc.orig 2014-10-08 22:20:20.000000000 +0200
+++ parser/dbus.cc 2015-02-24 14:10:15.656288643 +0100
@@ -149,7 +149,7 @@ ostream &dbus_rule::dump(ostream &os)
if (interface)
os << " interface=\"" << interface << "\"";
if (member)
- os << " member=\"" << member << os << "\"";
+ os << " member=\"" << member << "\"";
if (!(mode & AA_DBUS_BIND) && (peer_label || name)) {
os << " peer=( ";
Index: parser/af_rule.cc
===================================================================
--- parser/af_rule.cc.orig 2014-09-03 22:34:10.000000000 +0200
+++ parser/af_rule.cc 2015-02-24 14:14:31.851251654 +0100
@@ -148,11 +148,14 @@ ostream &af_rule::dump_peer(ostream &os)
ostream &af_rule::dump(ostream &os)
{
- os << dump_prefix(os);
+ dump_prefix(os);
os << af_name;
- os << dump_local(os);
+ dump_local(os);
if (has_peer_conds())
- os << " peer=(" << dump_peer(os) << ")";
+ {
+ os << " peer=(";
+ dump_peer(os) << ")";
+ }
os << ",\n";
return os;