summaryrefslogtreecommitdiff
path: root/source4/lib/policy/parse_adm.y
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-11 15:47:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:06:25 -0500
commitd1ee65c9cfb9f14bbfb622a5d77256d55e009468 (patch)
tree9e53723d7ffa9fd4cd80ecbe4b7e62ccdd7e30ab /source4/lib/policy/parse_adm.y
parented2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd (diff)
downloadsamba-d1ee65c9cfb9f14bbfb622a5d77256d55e009468.tar.gz
samba-d1ee65c9cfb9f14bbfb622a5d77256d55e009468.tar.bz2
samba-d1ee65c9cfb9f14bbfb622a5d77256d55e009468.zip
r25082: Avoid use of MACHINE because it's defined already on Tru64. Thanks to Björn and BaT for pointing this out.
(This used to be commit e2ea41740bc7781b3278f9533b4d24bc9222b3a2)
Diffstat (limited to 'source4/lib/policy/parse_adm.y')
-rw-r--r--source4/lib/policy/parse_adm.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/policy/parse_adm.y b/source4/lib/policy/parse_adm.y
index 450625f58a..1dc21cf1d3 100644
--- a/source4/lib/policy/parse_adm.y
+++ b/source4/lib/policy/parse_adm.y
@@ -37,8 +37,8 @@ extern int yylex (void);
%token CATEGORY
%token CLASS
-%token USER
-%token MACHINE
+%token CLASS_USER
+%token CLASS_MACHINE
%token POLICY
%token KEYNAME
%token EXPLAIN
@@ -73,7 +73,7 @@ admfile: classes strings;
classes: /* empty */ | class classes;
class: CLASS classvalue categories;
-classvalue: USER|MACHINE;
+classvalue: CLASS_USER|CLASS_MACHINE;
categories: /* empty */ | category categories;