← Back to branch summary

~sbeattie/apparmor/apparmor-ubuntu-2.6.0-merge

« back to all changes in this revision

Viewing changes to parser/immunix.h

  • Committer: Steve Beattie
  • Date: 2011-02-24 09:40:38 UTC
  • mfrom: (1306.1.312 upstream)
  • Revision ID: sbeattie@ubuntu.com-20110224094038-hhe6xhjsnqink6ob
New upstream 2.6.0 release (LP: #724193)

Show diffs side-by-side

added added

removed removed

Lines of Context:
parser/immunix.h
150
150
{
151
151
        if ((a & AA_USER_EXEC) && (b & AA_USER_EXEC) &&
152
152
            ((a & AA_USER_EXEC_TYPE) != (b & AA_USER_EXEC_TYPE)))
153
 
{ fprintf(stderr, "failed user merge 0x%x 0x%x\n", a, b);
 
153
          { //fprintf(stderr, "failed user merge 0x%x 0x%x\n", a, b);
154
154
                return 0;
155
155
}
156
156
        if ((a & AA_OTHER_EXEC) && (b & AA_OTHER_EXEC) &&
157
157
            ((a & AA_OTHER_EXEC_TYPE) != (b & AA_OTHER_EXEC_TYPE)))
158
 
{ fprintf(stderr, "failed other merge 0x%x 0x%x\n", a, b);
 
158
          { //fprintf(stderr, "failed other merge 0x%x 0x%x\n", a, b);
159
159
                return 0;
160
160
}
161
161
        return 1;