mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 12:58:07 +00:00
Code Issues Releases Wiki Activity

Patch from zbyniu to allow parser to build on glibc (<2.4)

Browse Source
This commit is contained in:
John Johansen 2008-06-09 21:17:41 +00:00
parent f670eaf464
commit 58b8a58e86
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/parser_misc.c
View File

@ -91,8 +91,12 @@ static struct keyword_table rlimit_table[] = {
{"locks", RLIMIT_LOCKS}, {"locks", RLIMIT_LOCKS},
{"sigpending", RLIMIT_SIGPENDING}, {"sigpending", RLIMIT_SIGPENDING},
{"msgqueue", RLIMIT_MSGQUEUE}, {"msgqueue", RLIMIT_MSGQUEUE},
#ifdef RLIMIT_NICE
{"nice", RLIMIT_NICE}, {"nice", RLIMIT_NICE},
#endif
#ifdef RLIMIT_RTPRIO
{"rtprio", RLIMIT_RTPRIO}, {"rtprio", RLIMIT_RTPRIO},
#endif
/* terminate */ /* terminate */
{NULL, 0} {NULL, 0}
}; };

5
parser/parser_yacc.y
View File

@ -668,12 +668,14 @@ rules: rules TOK_SET TOK_RLIMIT TOK_ID TOK_LE TOK_VALUE TOK_END_OF_RULE
case RLIMIT_NPROC: case RLIMIT_NPROC:
case RLIMIT_LOCKS: case RLIMIT_LOCKS:
case RLIMIT_SIGPENDING: case RLIMIT_SIGPENDING:
#ifdef RLIMIT_RTPRIO
case RLIMIT_RTPRIO: case RLIMIT_RTPRIO:
if ($6 == end || *end != '\0' || tmp < 0) if ($6 == end || *end != '\0' || tmp < 0)
yyerror("RLIMIT '%s' invalid value %s\n", $4, $6); yyerror("RLIMIT '%s' invalid value %s\n", $4, $6);
value = tmp; value = tmp;
break; break;
#endif
#ifdef RLIMIT_NICE
case RLIMIT_NICE: case RLIMIT_NICE:
if ($6 == end || *end != '\0') if ($6 == end || *end != '\0')
yyerror("RLIMIT '%s' invalid value %s\n", $4, $6); yyerror("RLIMIT '%s' invalid value %s\n", $4, $6);
@ -681,6 +683,7 @@ rules: rules TOK_SET TOK_RLIMIT TOK_ID TOK_LE TOK_VALUE TOK_END_OF_RULE
yyerror("RLIMIT '%s' out of range (-20 .. 19) %d\n", $4, tmp); yyerror("RLIMIT '%s' out of range (-20 .. 19) %d\n", $4, tmp);
value = tmp + 20; value = tmp + 20;
break; break;
#endif
case RLIMIT_FSIZE: case RLIMIT_FSIZE:
case RLIMIT_DATA: case RLIMIT_DATA:
case RLIMIT_STACK: case RLIMIT_STACK: