diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/policy/lex.c | 260 | ||||
| -rw-r--r-- | source4/lib/policy/lex.l | 4 | ||||
| -rw-r--r-- | source4/lib/policy/parse_adm.c | 34 | ||||
| -rw-r--r-- | source4/lib/policy/parse_adm.h | 8 | ||||
| -rw-r--r-- | source4/lib/policy/parse_adm.y | 6 |
5 files changed, 159 insertions, 153 deletions
diff --git a/source4/lib/policy/lex.c b/source4/lib/policy/lex.c index d599c92915..f52806935f 100644 --- a/source4/lib/policy/lex.c +++ b/source4/lib/policy/lex.c @@ -373,28 +373,28 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[185] = +static yyconst flex_int16_t yy_accept[188] = { 0, 0, 0, 39, 38, 34, 35, 38, 38, 31, 38, 29, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 38, 34, 0, 0, - 31, 0, 36, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 38, 34, 0, 0, 31, + 0, 36, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 0, 33, 37, - 32, 32, 32, 32, 32, 32, 32, 32, 9, 32, - 32, 32, 32, 15, 14, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 0, 33, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 16, - - 32, 18, 32, 32, 21, 32, 23, 24, 32, 0, - 32, 32, 32, 4, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 25, 0, 32, 32, - 32, 32, 5, 32, 32, 32, 32, 32, 32, 32, - 19, 32, 32, 32, 32, 0, 32, 32, 32, 6, - 32, 32, 10, 32, 12, 13, 17, 32, 32, 32, - 32, 27, 0, 32, 2, 3, 32, 8, 11, 20, - 32, 32, 28, 0, 32, 32, 22, 26, 30, 1, - 32, 32, 7, 0 + 32, 32, 32, 32, 32, 0, 33, 37, 32, 32, + 32, 32, 32, 32, 32, 32, 9, 32, 32, 32, + 15, 14, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 0, 33, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 16, 32, 18, 32, 32, 21, + + 32, 23, 32, 0, 32, 32, 32, 4, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 25, + 0, 32, 32, 32, 32, 32, 5, 32, 32, 32, + 32, 32, 32, 19, 32, 32, 32, 32, 0, 32, + 32, 32, 32, 32, 6, 32, 32, 10, 32, 12, + 17, 32, 32, 32, 32, 27, 0, 32, 2, 3, + 32, 32, 32, 8, 11, 20, 32, 32, 28, 0, + 32, 32, 32, 32, 22, 26, 30, 1, 32, 24, + 32, 32, 32, 32, 7, 13, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -408,10 +408,10 @@ static yyconst flex_int32_t yy_ec[256] = 9, 1, 1, 1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 19, - 35, 36, 37, 1, 6, 1, 19, 19, 19, 19, + 35, 36, 37, 1, 38, 1, 19, 19, 19, 19, - 19, 19, 38, 19, 39, 19, 19, 19, 19, 40, - 19, 19, 19, 41, 42, 43, 19, 19, 19, 19, + 19, 19, 39, 19, 40, 19, 19, 19, 19, 41, + 19, 19, 19, 42, 43, 44, 19, 19, 19, 19, 19, 19, 36, 1, 36, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -429,125 +429,131 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[44] = +static yyconst flex_int32_t yy_meta[45] = { 0, 1, 1, 2, 1, 1, 3, 3, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 1, 5, 1, 4, 4, 4, - 4, 4, 4 + 4, 4, 4, 4, 1, 5, 1, 3, 4, 4, + 4, 4, 4, 4 } ; -static yyconst flex_int16_t yy_base[190] = +static yyconst flex_int16_t yy_base[193] = { 0, - 0, 0, 213, 214, 210, 214, 207, 0, 203, 206, - 214, 196, 0, 34, 31, 33, 178, 192, 39, 37, - 38, 191, 29, 190, 175, 192, 159, 198, 0, 196, - 191, 194, 214, 0, 167, 166, 180, 183, 48, 168, - 173, 177, 164, 174, 153, 38, 163, 163, 162, 156, - 161, 155, 162, 154, 145, 163, 155, 132, 0, 214, - 156, 159, 160, 143, 160, 155, 143, 138, 0, 145, - 143, 141, 146, 0, 0, 148, 147, 131, 141, 128, - 134, 131, 126, 127, 123, 111, 0, 127, 134, 129, - 120, 117, 117, 132, 115, 133, 121, 131, 122, 0, - - 112, 0, 126, 119, 0, 112, 0, 0, 121, 95, - 110, 108, 120, 0, 109, 115, 104, 113, 108, 107, - 102, 100, 104, 87, 93, 92, 29, 78, 96, 89, - 91, 85, 0, 81, 79, 88, 82, 95, 94, 95, - 0, 92, 76, 94, 45, 65, 84, 67, 67, 0, - 76, 69, 0, 68, 0, 0, 0, 83, 81, 72, - 78, 0, 50, 63, 0, 0, 69, 0, 0, 0, - 76, 74, 0, 50, 44, 52, 0, 0, 214, 0, - 37, 35, 0, 214, 71, 76, 79, 57, 82 + 0, 0, 218, 219, 215, 219, 212, 0, 208, 211, + 219, 201, 0, 35, 32, 34, 183, 197, 40, 38, + 39, 196, 30, 195, 198, 164, 204, 0, 202, 197, + 200, 219, 0, 173, 172, 186, 189, 49, 174, 179, + 183, 170, 180, 159, 159, 168, 168, 167, 161, 166, + 160, 167, 159, 150, 161, 137, 0, 219, 162, 165, + 166, 149, 166, 161, 149, 144, 0, 151, 149, 147, + 0, 0, 155, 154, 138, 148, 135, 141, 138, 133, + 131, 118, 0, 135, 142, 137, 128, 125, 125, 140, + 123, 141, 129, 139, 0, 121, 0, 135, 128, 0, + + 121, 0, 130, 103, 119, 117, 129, 101, 117, 123, + 112, 121, 116, 115, 110, 113, 96, 102, 101, 30, + 86, 105, 98, 100, 39, 94, 0, 90, 88, 97, + 91, 104, 105, 0, 102, 86, 104, 50, 74, 94, + 77, 77, 99, 80, 0, 84, 77, 0, 76, 0, + 0, 91, 89, 80, 86, 0, 57, 71, 0, 0, + 86, 83, 75, 0, 0, 0, 82, 80, 0, 56, + 63, 74, 63, 71, 0, 0, 219, 0, 57, 0, + 44, 48, 37, 48, 0, 0, 219, 73, 78, 81, + 47, 84 + } ; -static yyconst flex_int16_t yy_def[190] = +static yyconst flex_int16_t yy_def[193] = { 0, - 184, 1, 184, 184, 184, 184, 184, 185, 184, 186, - 184, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 184, 184, 188, 185, - 184, 186, 184, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 184, 189, 184, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 184, 189, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 1, 187, 187, 187, 187, 187, 188, 187, 189, + 187, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 187, 187, 191, 188, 187, + 189, 187, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 187, 192, 187, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 187, 192, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + + 190, 190, 190, 187, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 187, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 187, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 187, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 190, 190, 190, 187, + 190, 190, 190, 190, 190, 190, 187, 190, 190, 190, + 190, 190, 190, 190, 190, 190, 0, 187, 187, 187, + 187, 187 - 187, 187, 187, 187, 187, 187, 187, 187, 187, 184, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 184, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 184, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 184, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 184, 187, 187, 187, 187, 184, 187, - 187, 187, 187, 0, 184, 184, 184, 184, 184 } ; -static yyconst flex_int16_t yy_nxt[258] = +static yyconst flex_int16_t yy_nxt[264] = { 0, 4, 5, 6, 7, 8, 4, 9, 10, 11, 12, 13, 14, 15, 16, 13, 13, 13, 17, 13, 18, - 13, 19, 20, 13, 21, 13, 22, 23, 24, 25, - 26, 13, 13, 13, 27, 13, 4, 13, 13, 13, - 13, 13, 13, 36, 39, 41, 48, 50, 46, 73, - 37, 144, 145, 53, 38, 42, 47, 40, 54, 161, - 59, 51, 65, 183, 182, 43, 49, 162, 66, 181, - 74, 30, 180, 30, 30, 30, 32, 32, 32, 32, - 32, 34, 34, 34, 87, 87, 179, 178, 177, 176, - 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, - - 165, 164, 163, 160, 159, 158, 157, 156, 155, 154, - 153, 152, 151, 150, 149, 148, 147, 146, 143, 142, - 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, - 131, 130, 129, 128, 127, 126, 125, 124, 123, 122, - 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, - 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, - 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, - 91, 90, 89, 88, 86, 85, 84, 83, 82, 81, - 80, 79, 78, 77, 76, 75, 72, 71, 70, 69, - 68, 67, 64, 63, 62, 61, 33, 31, 60, 28, - - 58, 57, 56, 55, 52, 45, 44, 35, 33, 31, - 29, 28, 184, 3, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184 + 13, 19, 20, 13, 21, 13, 22, 23, 24, 13, + 25, 13, 13, 13, 26, 13, 4, 4, 13, 13, + 13, 13, 13, 13, 35, 38, 40, 47, 49, 45, + 57, 36, 137, 138, 52, 37, 41, 46, 39, 53, + 143, 186, 50, 63, 155, 185, 42, 48, 144, 64, + 184, 183, 156, 29, 182, 29, 29, 29, 31, 31, + 31, 31, 31, 33, 33, 33, 83, 83, 181, 180, + 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, + + 169, 168, 167, 166, 165, 164, 163, 162, 161, 160, + 159, 158, 157, 154, 153, 152, 151, 150, 149, 148, + 147, 146, 145, 142, 141, 140, 139, 136, 135, 134, + 133, 132, 131, 130, 129, 128, 127, 126, 125, 124, + 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, + 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, + 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, + 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, + 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, + 72, 71, 70, 69, 68, 67, 66, 65, 62, 61, + + 60, 59, 32, 30, 58, 27, 56, 55, 54, 51, + 44, 43, 34, 32, 30, 28, 27, 187, 3, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187 } ; -static yyconst flex_int16_t yy_chk[258] = +static yyconst flex_int16_t yy_chk[264] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 14, 15, 16, 20, 21, 19, 46, - 14, 127, 127, 23, 14, 16, 19, 15, 23, 145, - 188, 21, 39, 182, 181, 16, 20, 145, 39, 176, - 46, 185, 175, 185, 185, 185, 186, 186, 186, 186, - 186, 187, 187, 187, 189, 189, 174, 172, 171, 167, - 164, 163, 161, 160, 159, 158, 154, 152, 151, 149, - - 148, 147, 146, 144, 143, 142, 140, 139, 138, 137, - 136, 135, 134, 132, 131, 130, 129, 128, 126, 125, - 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, - 113, 112, 111, 110, 109, 106, 104, 103, 101, 99, - 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, - 88, 86, 85, 84, 83, 82, 81, 80, 79, 78, - 77, 76, 73, 72, 71, 70, 68, 67, 66, 65, - 64, 63, 62, 61, 58, 57, 56, 55, 54, 53, - 52, 51, 50, 49, 48, 47, 45, 44, 43, 42, - 41, 40, 38, 37, 36, 35, 32, 31, 30, 28, - - 27, 26, 25, 24, 22, 18, 17, 12, 10, 9, - 7, 5, 3, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184 + 1, 1, 1, 1, 14, 15, 16, 20, 21, 19, + 191, 14, 120, 120, 23, 14, 16, 19, 15, 23, + 125, 184, 21, 38, 138, 183, 16, 20, 125, 38, + 182, 181, 138, 188, 179, 188, 188, 188, 189, 189, + 189, 189, 189, 190, 190, 190, 192, 192, 174, 173, + 172, 171, 170, 168, 167, 163, 162, 161, 158, 157, + + 155, 154, 153, 152, 149, 147, 146, 144, 143, 142, + 141, 140, 139, 137, 136, 135, 133, 132, 131, 130, + 129, 128, 126, 124, 123, 122, 121, 119, 118, 117, + 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, + 106, 105, 104, 103, 101, 99, 98, 96, 94, 93, + 92, 91, 90, 89, 88, 87, 86, 85, 84, 82, + 81, 80, 79, 78, 77, 76, 75, 74, 73, 70, + 69, 68, 66, 65, 64, 63, 62, 61, 60, 59, + 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, + 46, 45, 44, 43, 42, 41, 40, 39, 37, 36, + + 35, 34, 31, 30, 29, 27, 26, 25, 24, 22, + 18, 17, 12, 10, 9, 7, 5, 3, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, + 187, 187, 187 } ; static yy_state_type yy_last_accepting_state; @@ -607,7 +613,7 @@ static bool utf16 = false; } \ } -#line 610 "lex.yy.c" +#line 616 "lex.yy.c" #define INITIAL 0 @@ -763,7 +769,7 @@ YY_DECL #line 47 "lex.l" -#line 766 "lex.yy.c" +#line 772 "lex.yy.c" if ( !(yy_init) ) { @@ -816,13 +822,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 185 ) + if ( yy_current_state >= 188 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 214 ); + while ( yy_base[yy_current_state] != 219 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -909,7 +915,7 @@ YY_RULE_SETUP case 13: YY_RULE_SETUP #line 61 "lex.l" -{ return MACHINE; } +{ return CLASS_MACHINE; } YY_BREAK case 14: YY_RULE_SETUP @@ -964,7 +970,7 @@ YY_RULE_SETUP case 24: YY_RULE_SETUP #line 72 "lex.l" -{ return USER; } +{ return CLASS_USER; } YY_BREAK case 25: YY_RULE_SETUP @@ -1052,7 +1058,7 @@ YY_RULE_SETUP #line 102 "lex.l" ECHO; YY_BREAK -#line 1055 "lex.yy.c" +#line 1061 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1336,7 +1342,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 185 ) + if ( yy_current_state >= 188 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1364,11 +1370,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 185 ) + if ( yy_current_state >= 188 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 184); + yy_is_jam = (yy_current_state == 187); return yy_is_jam ? 0 : yy_current_state; } 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; } 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 diff --git a/source4/lib/policy/parse_adm.h b/source4/lib/policy/parse_adm.h index ba134db19d..372e4b9680 100644 --- a/source4/lib/policy/parse_adm.h +++ b/source4/lib/policy/parse_adm.h @@ -41,8 +41,8 @@ enum yytokentype { CATEGORY = 258, CLASS = 259, - USER = 260, - MACHINE = 261, + CLASS_USER = 260, + CLASS_MACHINE = 261, POLICY = 262, KEYNAME = 263, EXPLAIN = 264, @@ -79,8 +79,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 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; |