mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factor all the permissions dump code into a single perms method

Browse source 
Also make sure the perms method properly switches to hex and back to dec
as some of the previous perm dump code did not.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
John Johansen 2012-03-22 07:49:43 -07:00
parent 2f603cc73e
commit 7fcbd543d7
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
parser/libapparmor_re/hfa.cc
View file

@ -340,14 +340,8 @@ void DFA::remove_unreachable(dfaflags_t flags)
cerr << "unreachable: " << **i;
if (*i == start)
cerr << " <==";
if (!(*i)->perms.is_null()) {
cerr << " (0x" << hex
<< (*i)->perms.allow << " "
<< (*i)->perms.deny << " "
<< (*i)->perms.audit << " "
<< (*i)->perms.quiet << dec
<< ')';
}
if (!(*i)->perms.is_null())
(*i)->perms.dump(cerr);
cerr << "\n";
}
State *current = *i;
@ -632,12 +626,8 @@ void DFA::dump(ostream & os)
os << **i;
if (*i == start)
os << " <== (allow/deny/audit/quiet)";
if (!(*i)->perms.is_null()) {
os << " (0x " << hex << (*i)->perms.allow << "/"
<< (*i)->perms.deny << "/"
<< (*i)->perms.audit << "/"
<< (*i)->perms.quiet << ')';
}
if (!(*i)->perms.is_null())
(*i)->perms.dump(os);
os << "\n";
}
}
@ -651,16 +641,22 @@ void DFA::dump(ostream & os)
if (j->second == nonmatching) {
excluded.insert(j->first);
} else {
os << **i << " -> " << *(j)->second << ": 0x"
os << **i;
if (!(*i)->perms.is_null())
os << " ", (*i)->perms.dump(os);
os << " -> " << *(j)->second << ": 0x"
<< hex << (int) j->first;
if (isprint(j->first))
os << " " << j->first;
os << "\n";
os << dec << "\n";
}
}
if ((*i)->otherwise != nonmatching) {
os << **i << " -> " << *(*i)->otherwise << ": [";
os << **i;
if (!(*i)->perms.is_null())
os << " ", (*i)->perms.dump(os);
os << " -> " << *(*i)->otherwise << ": [";
if (!excluded.empty()) {
os << "^";
for (Chars::iterator k = excluded.begin();
@ -668,7 +664,7 @@ void DFA::dump(ostream & os)
if (isprint(*k))
os << *k;
else
os << "\\0x" << hex << (int) *k;
os << "\\0x" << hex << (int) *k << dec;
}
}
os << "]\n";
@ -693,11 +689,9 @@ void DFA::dump_dot_graph(ostream & os)
os << "\t\tstyle=bold" << "\n";
}
if (!(*i)->perms.is_null()) {
os << "\t\tlabel=\"" << **i << "\\n(0x " << hex
<< (*i)->perms.allow << "/"
<< (*i)->perms.deny << "/"
<< (*i)->perms.audit << "/"
<< (*i)->perms.quiet << ")\"\n";
os << "\t\tlabel=\"" << **i << "\\n";
(*i)->perms.dump(os);
os << "\"\n";
}
os << "\t]" << "\n";
}
@ -714,7 +708,7 @@ void DFA::dump_dot_graph(ostream & os)
if (isprint(j->first))
os << j->first;
else
os << "\\0xhex" << (int) j->first;
os << "\\0x" << hex << (int) j->first << dec;
os << "\"\n\t]" << "\n";
}
@ -729,7 +723,7 @@ void DFA::dump_dot_graph(ostream & os)
if (isprint(*i))
os << *i;
else
os << "\\0x" << hex << (int) *i;
os << "\\0x" << hex << (int) *i << dec;
}
os << "]\"" << "\n";
}

7
parser/libapparmor_re/hfa.h
View file

@ -45,6 +45,13 @@ public:
bool is_null(void) { return !(allow | deny | audit | quiet); }
void dump(ostream &os)
{
os << " (0x " << hex
<< allow << "/" << deny << "/" << audit << "/" << quiet
<< ')' << dec;
}
void clear(void) { allow = deny = audit = quiet = 0; }
void add(perms_t &rhs)
{