Regen for proper line numbers.

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index b1149578ce54be8310dfa8e1718e5aa6c282137b..a4484ecd371fadd40d09ee772b54a8d781ff72ca 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -161,7 +161,7 @@ sudoerserror(const char *s)
     parse_error = true;
     debug_return;
 }
-#line 122 "gram.y"
+#line 128 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -178,7 +178,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 175 "gram.c"
+#line 181 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -705,7 +705,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 int yystacksize;
-#line 674 "gram.y"
+#line 680 "gram.y"
 static struct defaults *
 new_default(char *var, char *val, int op)
 {
@@ -908,7 +908,7 @@ init_parser(const char *path, bool quiet)
 
     debug_return;
 }
-#line 853 "gram.c"
+#line 859 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1111,127 +1111,127 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 204 "gram.y"
+#line 210 "gram.y"
 { ; }
 break;
 case 5:
-#line 212 "gram.y"
+#line 218 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 215 "gram.y"
+#line 221 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 218 "gram.y"
+#line 224 "gram.y"
 {
                            add_userspec(yyvsp[-1].member, yyvsp[0].privilege);
                        }
 break;
 case 8:
-#line 221 "gram.y"
+#line 227 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 224 "gram.y"
+#line 230 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 227 "gram.y"
+#line 233 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 230 "gram.y"
+#line 236 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 233 "gram.y"
+#line 239 "gram.y"
 {
                            add_defaults(DEFAULTS, NULL, yyvsp[0].defaults);
                        }
 break;
 case 13:
-#line 236 "gram.y"
+#line 242 "gram.y"
 {
                            add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 14:
-#line 239 "gram.y"
+#line 245 "gram.y"
 {
                            add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 15:
-#line 242 "gram.y"
+#line 248 "gram.y"
 {
                            add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 16:
-#line 245 "gram.y"
+#line 251 "gram.y"
 {
                            add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults);
                        }
 break;
 case 18:
-#line 251 "gram.y"
+#line 257 "gram.y"
 {
                            list_append(yyvsp[-2].defaults, yyvsp[0].defaults);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 257 "gram.y"
+#line 263 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, true);
                        }
 break;
 case 20:
-#line 260 "gram.y"
+#line 266 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, false);
                        }
 break;
 case 21:
-#line 263 "gram.y"
+#line 269 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
                        }
 break;
 case 22:
-#line 266 "gram.y"
+#line 272 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                        }
 break;
 case 23:
-#line 269 "gram.y"
+#line 275 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                        }
 break;
 case 25:
-#line 275 "gram.y"
+#line 281 "gram.y"
 {
                            list_append(yyvsp[-2].privilege, yyvsp[0].privilege);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 281 "gram.y"
+#line 287 "gram.y"
 {
                            struct privilege *p = ecalloc(1, sizeof(*p));
                            list2tq(&p->hostlist, yyvsp[-2].member);
@@ -1242,51 +1242,51 @@ case 26:
                        }
 break;
 case 27:
-#line 291 "gram.y"
+#line 297 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 28:
-#line 295 "gram.y"
+#line 301 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 29:
-#line 301 "gram.y"
+#line 307 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 30:
-#line 304 "gram.y"
+#line 310 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 31:
-#line 307 "gram.y"
+#line 313 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 32:
-#line 310 "gram.y"
+#line 316 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                        }
 break;
 case 33:
-#line 313 "gram.y"
+#line 319 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 35:
-#line 319 "gram.y"
+#line 325 "gram.y"
 {
                            list_append(yyvsp[-2].cmndspec, yyvsp[0].cmndspec);
 #ifdef HAVE_SELINUX
@@ -1326,7 +1326,7 @@ case 35:
                        }
 break;
 case 36:
-#line 358 "gram.y"
+#line 364 "gram.y"
 {
                            struct cmndspec *cs = ecalloc(1, sizeof(*cs));
                            if (yyvsp[-4].runas != NULL) {
@@ -1357,127 +1357,127 @@ case 36:
                        }
 break;
 case 37:
-#line 388 "gram.y"
+#line 394 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 38:
-#line 392 "gram.y"
+#line 398 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 39:
-#line 398 "gram.y"
+#line 404 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 40:
-#line 403 "gram.y"
+#line 409 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 41:
-#line 408 "gram.y"
+#line 414 "gram.y"
 {
                            yyval.seinfo.role = NULL;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 42:
-#line 412 "gram.y"
+#line 418 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[0].string;
                            yyval.seinfo.type = NULL;
                        }
 break;
 case 43:
-#line 416 "gram.y"
+#line 422 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[0].string;
                            yyval.seinfo.role = NULL;
                        }
 break;
 case 44:
-#line 420 "gram.y"
+#line 426 "gram.y"
 {
                            yyval.seinfo.role = yyvsp[-1].string;
                            yyval.seinfo.type = yyvsp[0].string;
                        }
 break;
 case 45:
-#line 424 "gram.y"
+#line 430 "gram.y"
 {
                            yyval.seinfo.type = yyvsp[-1].string;
                            yyval.seinfo.role = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 430 "gram.y"
+#line 436 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 47:
-#line 434 "gram.y"
+#line 440 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 48:
-#line 439 "gram.y"
+#line 445 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 49:
-#line 443 "gram.y"
+#line 449 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[0].string;
                            yyval.privinfo.limitprivs = NULL;
                        }
 break;
 case 50:
-#line 447 "gram.y"
+#line 453 "gram.y"
 {
                            yyval.privinfo.privs = NULL;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 51:
-#line 451 "gram.y"
+#line 457 "gram.y"
 {
                            yyval.privinfo.privs = yyvsp[-1].string;
                            yyval.privinfo.limitprivs = yyvsp[0].string;
                        }
 break;
 case 52:
-#line 455 "gram.y"
+#line 461 "gram.y"
 {
                            yyval.privinfo.limitprivs = yyvsp[-1].string;
                            yyval.privinfo.privs = yyvsp[0].string;
                        }
 break;
 case 53:
-#line 460 "gram.y"
+#line 466 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 54:
-#line 463 "gram.y"
+#line 469 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 55:
-#line 468 "gram.y"
+#line 474 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = new_member(NULL, MYSELF);
@@ -1485,7 +1485,7 @@ case 55:
                        }
 break;
 case 56:
-#line 473 "gram.y"
+#line 479 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[0].member;
@@ -1493,7 +1493,7 @@ case 56:
                        }
 break;
 case 57:
-#line 478 "gram.y"
+#line 484 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = yyvsp[-2].member;
@@ -1501,7 +1501,7 @@ case 57:
                        }
 break;
 case 58:
-#line 483 "gram.y"
+#line 489 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            /* $$->runasusers = NULL; */
@@ -1509,7 +1509,7 @@ case 58:
                        }
 break;
 case 59:
-#line 488 "gram.y"
+#line 494 "gram.y"
 {
                            yyval.runas = ecalloc(1, sizeof(struct runascontainer));
                            yyval.runas->runasusers = new_member(NULL, MYSELF);
@@ -1517,86 +1517,86 @@ case 59:
                        }
 break;
 case 60:
-#line 495 "gram.y"
+#line 501 "gram.y"
 {
                            yyval.tag.nopasswd = yyval.tag.noexec = yyval.tag.setenv =
                                yyval.tag.log_input = yyval.tag.log_output = UNSPEC;
                        }
 break;
 case 61:
-#line 499 "gram.y"
+#line 505 "gram.y"
 {
                            yyval.tag.nopasswd = true;
                        }
 break;
 case 62:
-#line 502 "gram.y"
+#line 508 "gram.y"
 {
                            yyval.tag.nopasswd = false;
                        }
 break;
 case 63:
-#line 505 "gram.y"
+#line 511 "gram.y"
 {
                            yyval.tag.noexec = true;
                        }
 break;
 case 64:
-#line 508 "gram.y"
+#line 514 "gram.y"
 {
                            yyval.tag.noexec = false;
                        }
 break;
 case 65:
-#line 511 "gram.y"
+#line 517 "gram.y"
 {
                            yyval.tag.setenv = true;
                        }
 break;
 case 66:
-#line 514 "gram.y"
+#line 520 "gram.y"
 {
                            yyval.tag.setenv = false;
                        }
 break;
 case 67:
-#line 517 "gram.y"
+#line 523 "gram.y"
 {
                            yyval.tag.log_input = true;
                        }
 break;
 case 68:
-#line 520 "gram.y"
+#line 526 "gram.y"
 {
                            yyval.tag.log_input = false;
                        }
 break;
 case 69:
-#line 523 "gram.y"
+#line 529 "gram.y"
 {
                            yyval.tag.log_output = true;
                        }
 break;
 case 70:
-#line 526 "gram.y"
+#line 532 "gram.y"
 {
                            yyval.tag.log_output = false;
                        }
 break;
 case 71:
-#line 531 "gram.y"
+#line 537 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 72:
-#line 534 "gram.y"
+#line 540 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 73:
-#line 537 "gram.y"
+#line 543 "gram.y"
 {
                            struct sudo_command *c = ecalloc(1, sizeof(*c));
                            c->cmnd = yyvsp[0].command.cmnd;
@@ -1605,7 +1605,7 @@ case 73:
                        }
 break;
 case 76:
-#line 549 "gram.y"
+#line 555 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, HOSTALIAS, yyvsp[0].member)) != NULL) {
@@ -1615,14 +1615,14 @@ case 76:
                        }
 break;
 case 78:
-#line 559 "gram.y"
+#line 565 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 81:
-#line 569 "gram.y"
+#line 575 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, CMNDALIAS, yyvsp[0].member)) != NULL) {
@@ -1632,14 +1632,14 @@ case 81:
                        }
 break;
 case 83:
-#line 579 "gram.y"
+#line 585 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 86:
-#line 589 "gram.y"
+#line 595 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, RUNASALIAS, yyvsp[0].member)) != NULL) {
@@ -1649,7 +1649,7 @@ case 86:
                        }
 break;
 case 89:
-#line 602 "gram.y"
+#line 608 "gram.y"
 {
                            char *s;
                            if ((s = alias_add(yyvsp[-2].string, USERALIAS, yyvsp[0].member)) != NULL) {
@@ -1659,96 +1659,96 @@ case 89:
                        }
 break;
 case 91:
-#line 612 "gram.y"
+#line 618 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 92:
-#line 618 "gram.y"
+#line 624 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 93:
-#line 622 "gram.y"
+#line 628 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 94:
-#line 628 "gram.y"
+#line 634 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 95:
-#line 631 "gram.y"
+#line 637 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 96:
-#line 634 "gram.y"
+#line 640 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                        }
 break;
 case 97:
-#line 637 "gram.y"
+#line 643 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                        }
 break;
 case 98:
-#line 640 "gram.y"
+#line 646 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
 case 100:
-#line 646 "gram.y"
+#line 652 "gram.y"
 {
                            list_append(yyvsp[-2].member, yyvsp[0].member);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 101:
-#line 652 "gram.y"
+#line 658 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 102:
-#line 656 "gram.y"
+#line 662 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 103:
-#line 662 "gram.y"
+#line 668 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                        }
 break;
 case 104:
-#line 665 "gram.y"
+#line 671 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                        }
 break;
 case 105:
-#line 668 "gram.y"
+#line 674 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                        }
 break;
-#line 1693 "gram.c"
+#line 1699 "gram.c"
     }
     yyssp -= yym;
     yystate = *yyssp;