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/lex.l | |
| 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/lex.l')
| -rw-r--r-- | source4/lib/policy/lex.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/policy/lex.l b/source4/lib/policy/lex.l index 1157bca2f7..797f59d6e2 100644 --- a/source4/lib/policy/lex.l +++ b/source4/lib/policy/lex.l @@ -58,7 +58,7 @@ END { return END; } EXPLAIN { return EXPLAIN; } ITEMLIST { return ITEMLIST; } KEYNAME { return KEYNAME; } -MACHINE { return MACHINE; } +CLASS_MACHINE { return CLASS_MACHINE; } MIN { return MINIMUM; } MAX { return MAXIMUM; } NAME { return NAME; } @@ -69,7 +69,7 @@ REQUIRED { return REQUIRED; } SPIN { return SPIN; } SUPPORTED { return SUPPORTED; } TEXT { return TEXT; } -USER { return USER; } +CLASS_USER { return CLASS_USER; } VALUE { return VALUE; } VALUENAME { return VALUENAME; } VALUEON { return VALUEON; } |