diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-11 15:47:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:25 -0500 |
| commit | d1ee65c9cfb9f14bbfb622a5d77256d55e009468 (patch) | |
| tree | 9e53723d7ffa9fd4cd80ecbe4b7e62ccdd7e30ab /source4/lib/policy/parse_adm.c | |
| parent | ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd (diff) | |
| download | samba-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.c')
| -rw-r--r-- | source4/lib/policy/parse_adm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source4/lib/policy/parse_adm.c b/source4/lib/policy/parse_adm.c index 91cda1b262..c68e2db814 100644 --- a/source4/lib/policy/parse_adm.c +++ b/source4/lib/policy/parse_adm.c @@ -68,8 +68,8 @@ enum yytokentype { CATEGORY = 258, CLASS = 259, - USER = 260, - MACHINE = 261, + CLASS_USER = 260, + CLASS_MACHINE = 261, POLICY = 262, KEYNAME = 263, EXPLAIN = 264, @@ -106,8 +106,8 @@ /* Tokens. */ #define CATEGORY 258 #define CLASS 259 -#define USER 260 -#define MACHINE 261 +#define CLASS_USER 260 +#define CLASS_MACHINE 261 #define POLICY 262 #define KEYNAME 263 #define EXPLAIN 264 @@ -520,19 +520,19 @@ static const yytype_uint8 yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "CATEGORY", "CLASS", "USER", "MACHINE", - "POLICY", "KEYNAME", "EXPLAIN", "VALUENAME", "VALUEON", "VALUEOFF", - "PART", "ITEMLIST", "NAME", "VALUE", "NUMERIC", "EDITTEXT", "TEXT", - "DROPDOWNLIST", "CHECKBOX", "MINIMUM", "MAXIMUM", "DEFAULT", "END", - "ACTIONLIST", "DEL", "SUPPORTED", "LITERAL", "INTEGER", "LOOKUPLITERAL", - "CLIENTEXT", "REQUIRED", "NOSORT", "SPIN", "EQUALS", "STRINGSSECTION", - "$accept", "admfile", "classes", "class", "classvalue", "categories", - "string", "category", "categoryitem", "categoryitems", "policy", - "policyitem", "policyitems", "valuetype", "part", "spin", "partitem", - "partitems", "min", "max", "defaultvalue", "explain", "value", "valueon", - "valueoff", "valuename", "keyname", "itemlist", "itemname", "itemvalue", - "item", "items", "supported", "actionlist", "actions", "variable", - "variables", "strings", 0 + "$end", "error", "$undefined", "CATEGORY", "CLASS", "CLASS_USER", + "CLASS_MACHINE", "POLICY", "KEYNAME", "EXPLAIN", "VALUENAME", "VALUEON", + "VALUEOFF", "PART", "ITEMLIST", "NAME", "VALUE", "NUMERIC", "EDITTEXT", + "TEXT", "DROPDOWNLIST", "CHECKBOX", "MINIMUM", "MAXIMUM", "DEFAULT", + "END", "ACTIONLIST", "DEL", "SUPPORTED", "LITERAL", "INTEGER", + "LOOKUPLITERAL", "CLIENTEXT", "REQUIRED", "NOSORT", "SPIN", "EQUALS", + "STRINGSSECTION", "$accept", "admfile", "classes", "class", "classvalue", + "categories", "string", "category", "categoryitem", "categoryitems", + "policy", "policyitem", "policyitems", "valuetype", "part", "spin", + "partitem", "partitems", "min", "max", "defaultvalue", "explain", + "value", "valueon", "valueoff", "valuename", "keyname", "itemlist", + "itemname", "itemvalue", "item", "items", "supported", "actionlist", + "actions", "variable", "variables", "strings", 0 }; #endif |