Include parse.h in sudoers.h since it will soon be required.

diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c
index ef4d1c9f6dffb08c903e62473b3756abaee48f48..b15150d72a17cc8e830925e66c591b4560465907 100644 (file)
--- a/plugins/sudoers/alias.c
+++ b/plugins/sudoers/alias.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "redblack.h"
 #include <gram.h>
 

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 65b3cb513e0de0c2b9b6713d3ad9b7348dd5a9ec..f84e4a2aa694cc515e72514cd9de9edd4685c787 100644 (file)
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -36,7 +36,6 @@
 #include <unistd.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "sudoers_version.h"
 #include "sudo_conf.h"
 #include "sudo_lbuf.h"

diff --git a/plugins/sudoers/cvtsudoers_json.c b/plugins/sudoers/cvtsudoers_json.c
index 504e80affd57a6c7506fc3e4006d66d57c70cf64..556160e9013ecdc08949c5a60e034ea5fea247d5 100644 (file)
--- a/plugins/sudoers/cvtsudoers_json.c
+++ b/plugins/sudoers/cvtsudoers_json.c
@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "cvtsudoers.h"
 #include <gram.h>
 

diff --git a/plugins/sudoers/cvtsudoers_ldif.c b/plugins/sudoers/cvtsudoers_ldif.c
index 47a8be1daf2015a193b24a0d94d0508a18ddffd7..e362e6e41a3750176cd5e85aca2ef8ee0bc71eef 100644 (file)
--- a/plugins/sudoers/cvtsudoers_ldif.c
+++ b/plugins/sudoers/cvtsudoers_ldif.c
@@ -31,7 +31,6 @@
 
 #include "sudoers.h"
 #include "sudo_ldap.h"
-#include "parse.h"
 #include "redblack.h"
 #include "cvtsudoers.h"
 #include "sudo_lbuf.h"

diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c
index b6ba7fad5c1cc198a67351c304551573e9640197..bc5c1fc78a335670af372a3315a930273129958a 100644 (file)
--- a/plugins/sudoers/defaults.c
+++ b/plugins/sudoers/defaults.c
@@ -37,7 +37,6 @@
 #include <syslog.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include <gram.h>
 
 /*

diff --git a/plugins/sudoers/filedigest.c b/plugins/sudoers/filedigest.c
index 674f476e7259eddf8dbc03b95157c1d8edf13916..117c3ce5a4180d864666f4bbb526b48e302d1f8c 100644 (file)
--- a/plugins/sudoers/filedigest.c
+++ b/plugins/sudoers/filedigest.c
@@ -38,7 +38,6 @@
 #include <errno.h>
 
 #include "sudoers.h"
-#include "parse.h"
 
 #ifdef HAVE_SHA224UPDATE
 # include <sha2.h>

diff --git a/plugins/sudoers/filedigest_gcrypt.c b/plugins/sudoers/filedigest_gcrypt.c
index 032d140e541161e0486f98f6715a8babd0742dd3..4721cf548eee5df4dddc7aa25ee5a9a16f474bc7 100644 (file)
--- a/plugins/sudoers/filedigest_gcrypt.c
+++ b/plugins/sudoers/filedigest_gcrypt.c
@@ -35,7 +35,6 @@
 #include <gcrypt.h>
 
 #include "sudoers.h"
-#include "parse.h"
 
 unsigned char *
 sudo_filedigest(int fd, const char *file, int digest_type, size_t *digest_lenp)

diff --git a/plugins/sudoers/filedigest_openssl.c b/plugins/sudoers/filedigest_openssl.c
index 83d2627e013520d70cb65d8038238a26ef7f92f2..3d0fc22201556a06671a9980d94b67a40f528ca5 100644 (file)
--- a/plugins/sudoers/filedigest_openssl.c
+++ b/plugins/sudoers/filedigest_openssl.c
@@ -35,7 +35,6 @@
 #include <openssl/sha.h>
 
 #include "sudoers.h"
-#include "parse.h"
 
 union ANY_CTX {
     SHA256_CTX sha256;

diff --git a/plugins/sudoers/fmtsudoers.c b/plugins/sudoers/fmtsudoers.c
index 9f3eb251bed78a93295beefe85a6a55169e52c1e..bd1a930fa4f0bf3e3c7fb8b9d69dd5c3286f18b4 100644 (file)
--- a/plugins/sudoers/fmtsudoers.c
+++ b/plugins/sudoers/fmtsudoers.c
@@ -28,7 +28,6 @@
 #include <time.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "sudo_lbuf.h"
 #include <gram.h>
 

diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c
index c0ef367c188c6c72b00ba25132186c23db33027f..f0bd0743334e8ebdd37359d04f7baca342529102 100644 (file)
--- a/plugins/sudoers/gram.c
+++ b/plugins/sudoers/gram.c
@@ -83,8 +83,7 @@
 #endif /* YYBISON && HAVE_ALLOCA_H && !__GNUC__ */
 #include <errno.h>
 
-#include "sudoers.h" /* XXX */
-#include "parse.h"
+#include "sudoers.h"
 #include "toke.h"
 
 /* If we last saw a newline the entry is on the preceding line. */
@@ -110,7 +109,7 @@ static bool add_userspec(struct member *, struct privilege *);
 static struct defaults *new_default(char *, char *, short);
 static struct member *new_member(char *, int);
 static struct sudo_digest *new_digest(int, char *);
-#line 77 "gram.y"
+#line 76 "gram.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -127,7 +126,7 @@ typedef union {
     int tok;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 130 "gram.c"
+#line 129 "gram.c"
 #define COMMAND 257
 #define ALIAS 258
 #define DEFVAR 259
@@ -667,7 +666,7 @@ short *yysslim;
 YYSTYPE *yyvs;
 unsigned int yystacksize;
 int yyparse(void);
-#line 899 "gram.y"
+#line 898 "gram.y"
 void
 sudoerserror(const char *s)
 {
@@ -1046,7 +1045,7 @@ init_options(struct command_options *opts)
     opts->limitprivs = NULL;
 #endif
 }
-#line 997 "gram.c"
+#line 996 "gram.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1255,23 +1254,23 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 175 "gram.y"
+#line 174 "gram.y"
 { ; }
 break;
 case 5:
-#line 183 "gram.y"
+#line 182 "gram.y"
 {
                            ;
                        }
 break;
 case 6:
-#line 186 "gram.y"
+#line 185 "gram.y"
 {
                            yyerrok;
                        }
 break;
 case 7:
-#line 189 "gram.y"
+#line 188 "gram.y"
 {
                            if (!add_userspec(yyvsp[-1].member, yyvsp[0].privilege)) {
                                sudoerserror(N_("unable to allocate memory"));
@@ -1280,73 +1279,73 @@ case 7:
                        }
 break;
 case 8:
-#line 195 "gram.y"
+#line 194 "gram.y"
 {
                            ;
                        }
 break;
 case 9:
-#line 198 "gram.y"
+#line 197 "gram.y"
 {
                            ;
                        }
 break;
 case 10:
-#line 201 "gram.y"
+#line 200 "gram.y"
 {
                            ;
                        }
 break;
 case 11:
-#line 204 "gram.y"
+#line 203 "gram.y"
 {
                            ;
                        }
 break;
 case 12:
-#line 207 "gram.y"
+#line 206 "gram.y"
 {
                            if (!add_defaults(DEFAULTS, NULL, yyvsp[0].defaults))
                                YYERROR;
                        }
 break;
 case 13:
-#line 211 "gram.y"
+#line 210 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults))
                                YYERROR;
                        }
 break;
 case 14:
-#line 215 "gram.y"
+#line 214 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults))
                                YYERROR;
                        }
 break;
 case 15:
-#line 219 "gram.y"
+#line 218 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults))
                                YYERROR;
                        }
 break;
 case 16:
-#line 223 "gram.y"
+#line 222 "gram.y"
 {
                            if (!add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults))
                                YYERROR;
                        }
 break;
 case 18:
-#line 230 "gram.y"
+#line 229 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].defaults, yyvsp[0].defaults, entries);
                            yyval.defaults = yyvsp[-2].defaults;
                        }
 break;
 case 19:
-#line 236 "gram.y"
+#line 235 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, true);
                            if (yyval.defaults == NULL) {
@@ -1356,7 +1355,7 @@ case 19:
                        }
 break;
 case 20:
-#line 243 "gram.y"
+#line 242 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[0].string, NULL, false);
                            if (yyval.defaults == NULL) {
@@ -1366,7 +1365,7 @@ case 20:
                        }
 break;
 case 21:
-#line 250 "gram.y"
+#line 249 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true);
                            if (yyval.defaults == NULL) {
@@ -1376,7 +1375,7 @@ case 21:
                        }
 break;
 case 22:
-#line 257 "gram.y"
+#line 256 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+');
                            if (yyval.defaults == NULL) {
@@ -1386,7 +1385,7 @@ case 22:
                        }
 break;
 case 23:
-#line 264 "gram.y"
+#line 263 "gram.y"
 {
                            yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-');
                            if (yyval.defaults == NULL) {
@@ -1396,14 +1395,14 @@ case 23:
                        }
 break;
 case 25:
-#line 274 "gram.y"
+#line 273 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].privilege, yyvsp[0].privilege, entries);
                            yyval.privilege = yyvsp[-2].privilege;
                        }
 break;
 case 26:
-#line 280 "gram.y"
+#line 279 "gram.y"
 {
                            struct privilege *p = calloc(1, sizeof(*p));
                            if (p == NULL) {
@@ -1418,21 +1417,21 @@ case 26:
                        }
 break;
 case 27:
-#line 294 "gram.y"
+#line 293 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 28:
-#line 298 "gram.y"
+#line 297 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 29:
-#line 304 "gram.y"
+#line 303 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1442,7 +1441,7 @@ case 29:
                        }
 break;
 case 30:
-#line 311 "gram.y"
+#line 310 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1452,7 +1451,7 @@ case 30:
                        }
 break;
 case 31:
-#line 318 "gram.y"
+#line 317 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -1462,7 +1461,7 @@ case 31:
                        }
 break;
 case 32:
-#line 325 "gram.y"
+#line 324 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NTWKADDR);
                            if (yyval.member == NULL) {
@@ -1472,7 +1471,7 @@ case 32:
                        }
 break;
 case 33:
-#line 332 "gram.y"
+#line 331 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -1482,7 +1481,7 @@ case 33:
                        }
 break;
 case 35:
-#line 342 "gram.y"
+#line 341 "gram.y"
 {
                            struct cmndspec *prev;
                            prev = HLTQ_LAST(yyvsp[-2].cmndspec, cmndspec, entries);
@@ -1536,7 +1535,7 @@ case 35:
                        }
 break;
 case 36:
-#line 395 "gram.y"
+#line 394 "gram.y"
 {
                            struct cmndspec *cs = calloc(1, sizeof(*cs));
                            if (cs == NULL) {
@@ -1588,7 +1587,7 @@ case 36:
                        }
 break;
 case 37:
-#line 446 "gram.y"
+#line 445 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA224, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1598,7 +1597,7 @@ case 37:
                        }
 break;
 case 38:
-#line 453 "gram.y"
+#line 452 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA256, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1608,7 +1607,7 @@ case 38:
                        }
 break;
 case 39:
-#line 460 "gram.y"
+#line 459 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA384, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1618,7 +1617,7 @@ case 39:
                        }
 break;
 case 40:
-#line 467 "gram.y"
+#line 466 "gram.y"
 {
                            yyval.digest = new_digest(SUDO_DIGEST_SHA512, yyvsp[0].string);
                            if (yyval.digest == NULL) {
@@ -1628,13 +1627,13 @@ case 40:
                        }
 break;
 case 41:
-#line 476 "gram.y"
+#line 475 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                        }
 break;
 case 42:
-#line 479 "gram.y"
+#line 478 "gram.y"
 {
                            if (yyvsp[0].member->type != COMMAND) {
                                sudoerserror(N_("a digest requires a path name"));
@@ -1646,75 +1645,75 @@ case 42:
                        }
 break;
 case 43:
-#line 490 "gram.y"
+#line 489 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 44:
-#line 494 "gram.y"
+#line 493 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 45:
-#line 500 "gram.y"
+#line 499 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 46:
-#line 505 "gram.y"
+#line 504 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 47:
-#line 509 "gram.y"
+#line 508 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 48:
-#line 514 "gram.y"
+#line 513 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 49:
-#line 519 "gram.y"
+#line 518 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 50:
-#line 524 "gram.y"
+#line 523 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 51:
-#line 528 "gram.y"
+#line 527 "gram.y"
 {
                            yyval.string = yyvsp[0].string;
                        }
 break;
 case 52:
-#line 533 "gram.y"
+#line 532 "gram.y"
 {
                            yyval.runas = NULL;
                        }
 break;
 case 53:
-#line 536 "gram.y"
+#line 535 "gram.y"
 {
                            yyval.runas = yyvsp[-1].runas;
                        }
 break;
 case 54:
-#line 541 "gram.y"
+#line 540 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1732,7 +1731,7 @@ case 54:
                        }
 break;
 case 55:
-#line 556 "gram.y"
+#line 555 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1744,7 +1743,7 @@ case 55:
                        }
 break;
 case 56:
-#line 565 "gram.y"
+#line 564 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1756,7 +1755,7 @@ case 56:
                        }
 break;
 case 57:
-#line 574 "gram.y"
+#line 573 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas == NULL) {
@@ -1768,7 +1767,7 @@ case 57:
                        }
 break;
 case 58:
-#line 583 "gram.y"
+#line 582 "gram.y"
 {
                            yyval.runas = calloc(1, sizeof(struct runascontainer));
                            if (yyval.runas != NULL) {
@@ -1786,13 +1785,13 @@ case 58:
                        }
 break;
 case 59:
-#line 600 "gram.y"
+#line 599 "gram.y"
 {
                            init_options(&yyval.options);
                        }
 break;
 case 60:
-#line 603 "gram.y"
+#line 602 "gram.y"
 {
                            yyval.options.notbefore = parse_gentime(yyvsp[0].string);
                            free(yyvsp[0].string);
@@ -1803,7 +1802,7 @@ case 60:
                        }
 break;
 case 61:
-#line 611 "gram.y"
+#line 610 "gram.y"
 {
                            yyval.options.notafter = parse_gentime(yyvsp[0].string);
                            free(yyvsp[0].string);
@@ -1814,7 +1813,7 @@ case 61:
                        }
 break;
 case 62:
-#line 619 "gram.y"
+#line 618 "gram.y"
 {
                            yyval.options.timeout = parse_timeout(yyvsp[0].string);
                            free(yyvsp[0].string);
@@ -1828,7 +1827,7 @@ case 62:
                        }
 break;
 case 63:
-#line 630 "gram.y"
+#line 629 "gram.y"
 {
 #ifdef HAVE_SELINUX
                            free(yyval.options.role);
@@ -1837,7 +1836,7 @@ case 63:
                        }
 break;
 case 64:
-#line 636 "gram.y"
+#line 635 "gram.y"
 {
 #ifdef HAVE_SELINUX
                            free(yyval.options.type);
@@ -1846,7 +1845,7 @@ case 64:
                        }
 break;
 case 65:
-#line 642 "gram.y"
+#line 641 "gram.y"
 {
 #ifdef HAVE_PRIV_SET
                            free(yyval.options.privs);
@@ -1855,7 +1854,7 @@ case 65:
                        }
 break;
 case 66:
-#line 648 "gram.y"
+#line 647 "gram.y"
 {
 #ifdef HAVE_PRIV_SET
                            free(yyval.options.limitprivs);
@@ -1864,97 +1863,97 @@ case 66:
                        }
 break;
 case 67:
-#line 656 "gram.y"
+#line 655 "gram.y"
 {
                            TAGS_INIT(yyval.tag);
                        }
 break;
 case 68:
-#line 659 "gram.y"
+#line 658 "gram.y"
 {
                            yyval.tag.nopasswd = true;
                        }
 break;
 case 69:
-#line 662 "gram.y"
+#line 661 "gram.y"
 {
                            yyval.tag.nopasswd = false;
                        }
 break;
 case 70:
-#line 665 "gram.y"
+#line 664 "gram.y"
 {
                            yyval.tag.noexec = true;
                        }
 break;
 case 71:
-#line 668 "gram.y"
+#line 667 "gram.y"
 {
                            yyval.tag.noexec = false;
                        }
 break;
 case 72:
-#line 671 "gram.y"
+#line 670 "gram.y"
 {
                            yyval.tag.setenv = true;
                        }
 break;
 case 73:
-#line 674 "gram.y"
+#line 673 "gram.y"
 {
                            yyval.tag.setenv = false;
                        }
 break;
 case 74:
-#line 677 "gram.y"
+#line 676 "gram.y"
 {
                            yyval.tag.log_input = true;
                        }
 break;
 case 75:
-#line 680 "gram.y"
+#line 679 "gram.y"
 {
                            yyval.tag.log_input = false;
                        }
 break;
 case 76:
-#line 683 "gram.y"
+#line 682 "gram.y"
 {
                            yyval.tag.log_output = true;
                        }
 break;
 case 77:
-#line 686 "gram.y"
+#line 685 "gram.y"
 {
                            yyval.tag.log_output = false;
                        }
 break;
 case 78:
-#line 689 "gram.y"
+#line 688 "gram.y"
 {
                            yyval.tag.follow = true;
                        }
 break;
 case 79:
-#line 692 "gram.y"
+#line 691 "gram.y"
 {
                            yyval.tag.follow = false;
                        }
 break;
 case 80:
-#line 695 "gram.y"
+#line 694 "gram.y"
 {
                            yyval.tag.send_mail = true;
                        }
 break;
 case 81:
-#line 698 "gram.y"
+#line 697 "gram.y"
 {
                            yyval.tag.send_mail = false;
                        }
 break;
 case 82:
-#line 703 "gram.y"
+#line 702 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -1964,7 +1963,7 @@ case 82:
                        }
 break;
 case 83:
-#line 710 "gram.y"
+#line 709 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -1974,7 +1973,7 @@ case 83:
                        }
 break;
 case 84:
-#line 717 "gram.y"
+#line 716 "gram.y"
 {
                            struct sudo_command *c = calloc(1, sizeof(*c));
                            if (c == NULL) {
@@ -1992,7 +1991,7 @@ case 84:
                        }
 break;
 case 87:
-#line 738 "gram.y"
+#line 737 "gram.y"
 {
                            const char *s;
                            s = alias_add(yyvsp[-2].string, HOSTALIAS, sudoers, this_lineno, yyvsp[0].member);
@@ -2003,14 +2002,14 @@ case 87:
                        }
 break;
 case 89:
-#line 749 "gram.y"
+#line 748 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 92:
-#line 759 "gram.y"
+#line 758 "gram.y"
 {
                            const char *s;
                            s = alias_add(yyvsp[-2].string, CMNDALIAS, sudoers, this_lineno, yyvsp[0].member);
@@ -2021,14 +2020,14 @@ case 92:
                        }
 break;
 case 94:
-#line 770 "gram.y"
+#line 769 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 97:
-#line 780 "gram.y"
+#line 779 "gram.y"
 {
                            const char *s;
                            s = alias_add(yyvsp[-2].string, RUNASALIAS, sudoers, this_lineno, yyvsp[0].member);
@@ -2039,7 +2038,7 @@ case 97:
                        }
 break;
 case 100:
-#line 794 "gram.y"
+#line 793 "gram.y"
 {
                            const char *s;
                            s = alias_add(yyvsp[-2].string, USERALIAS, sudoers, this_lineno, yyvsp[0].member);
@@ -2050,28 +2049,28 @@ case 100:
                        }
 break;
 case 102:
-#line 805 "gram.y"
+#line 804 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 103:
-#line 811 "gram.y"
+#line 810 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 104:
-#line 815 "gram.y"
+#line 814 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 105:
-#line 821 "gram.y"
+#line 820 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -2081,7 +2080,7 @@ case 105:
                        }
 break;
 case 106:
-#line 828 "gram.y"
+#line 827 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -2091,7 +2090,7 @@ case 106:
                        }
 break;
 case 107:
-#line 835 "gram.y"
+#line 834 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, NETGROUP);
                            if (yyval.member == NULL) {
@@ -2101,7 +2100,7 @@ case 107:
                        }
 break;
 case 108:
-#line 842 "gram.y"
+#line 841 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, USERGROUP);
                            if (yyval.member == NULL) {
@@ -2111,7 +2110,7 @@ case 108:
                        }
 break;
 case 109:
-#line 849 "gram.y"
+#line 848 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2121,28 +2120,28 @@ case 109:
                        }
 break;
 case 111:
-#line 859 "gram.y"
+#line 858 "gram.y"
 {
                            HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries);
                            yyval.member = yyvsp[-2].member;
                        }
 break;
 case 112:
-#line 865 "gram.y"
+#line 864 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = false;
                        }
 break;
 case 113:
-#line 869 "gram.y"
+#line 868 "gram.y"
 {
                            yyval.member = yyvsp[0].member;
                            yyval.member->negated = true;
                        }
 break;
 case 114:
-#line 875 "gram.y"
+#line 874 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, ALIAS);
                            if (yyval.member == NULL) {
@@ -2152,7 +2151,7 @@ case 114:
                        }
 break;
 case 115:
-#line 882 "gram.y"
+#line 881 "gram.y"
 {
                            yyval.member = new_member(NULL, ALL);
                            if (yyval.member == NULL) {
@@ -2162,7 +2161,7 @@ case 115:
                        }
 break;
 case 116:
-#line 889 "gram.y"
+#line 888 "gram.y"
 {
                            yyval.member = new_member(yyvsp[0].string, WORD);
                            if (yyval.member == NULL) {
@@ -2171,7 +2170,7 @@ case 116:
                            }
                        }
 break;
-#line 2122 "gram.c"
+#line 2121 "gram.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y
index 489c98f0f7810fe61b5d04104dc28c6c6515d92c..91986f444580e00d1266184762d64ed0b908b706 100644 (file)
--- a/plugins/sudoers/gram.y
+++ b/plugins/sudoers/gram.y
@@ -45,8 +45,7 @@
 #endif /* YYBISON && HAVE_ALLOCA_H && !__GNUC__ */
 #include <errno.h>
 
-#include "sudoers.h" /* XXX */
-#include "parse.h"
+#include "sudoers.h"
 #include "toke.h"
 
 /* If we last saw a newline the entry is on the preceding line. */

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index d0a1c88085e64c993354677a77cdfbe4ad46841f..26617329cc26ea995ade91a2d71166ac2fefaffb 100644 (file)
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -54,7 +54,6 @@
 #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */
 
 #include "sudoers.h"
-#include "parse.h"
 #include "gram.h"
 #include "sudo_lbuf.h"
 #include "sudo_ldap.h"

diff --git a/plugins/sudoers/ldap_conf.c b/plugins/sudoers/ldap_conf.c
index 6fcb0c85d7b0ddec611972ea148744398403173f..31c8babe5e73920f6fa2469f21d8330ac9b5555e 100644 (file)
--- a/plugins/sudoers/ldap_conf.c
+++ b/plugins/sudoers/ldap_conf.c
@@ -44,7 +44,6 @@
 #endif
 
 #include "sudoers.h"
-#include "parse.h"
 #include "sudo_lbuf.h"
 #include "sudo_ldap.h"
 #include "sudo_ldap_conf.h"

diff --git a/plugins/sudoers/ldap_util.c b/plugins/sudoers/ldap_util.c
index 06770d4a45176f8716b0dee915af443fe75c96e9..aa468a33a48e39d313c326845eb219e732075fac 100644 (file)
--- a/plugins/sudoers/ldap_util.c
+++ b/plugins/sudoers/ldap_util.c
@@ -34,7 +34,6 @@
 
 #include "sudoers.h"
 #include "interfaces.h"
-#include "parse.h"
 #include "gram.h"
 #include "sudo_lbuf.h"
 #include "sudo_ldap.h"

diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c
index d51d8fd1546707f191d1b3834c07bcc44a5bdfc2..4fd77a868db057a534242a474815a730c75837dd 100644 (file)
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -61,7 +61,6 @@
 #include <errno.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include <gram.h>
 
 #ifdef HAVE_FNMATCH

diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index 9ff707dbd4eb34029af8ed32c9e3d0cebb44870e..587c64b8cfbfdb7e39243ec0497280080d2b5a1e 100644 (file)
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -34,7 +34,6 @@
 #include <time.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "sudo_lbuf.h"
 #include <gram.h>
 

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index dbc70b09afc918a0149aaf9ba1e78decc7a11f97..0bb6dca7694e9ce4660166ae18c57f0053de9ef2 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -35,7 +35,6 @@
 #include "sudoers.h"
 #include "sudoers_version.h"
 #include "interfaces.h"
-#include "parse.h" /* for parse_timeout() */
 
 /*
  * Info passed in from the sudo front-end.

diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c
index fc7035366286c4e1d83a67398489e7304cdcab8a..5f67d4dca1a04c567f581574adf79e983ce3496f 100644 (file)
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -38,7 +38,6 @@
 #define SUDO_ERROR_WRAP 0
 
 #include "sudoers.h"
-#include "parse.h"
 #include "interfaces.h"
 
 __dso_public int main(int argc, char *argv[]);

diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c
index b380125a4f1bd3200fb9a05da2b4df1c6c796090..bcd70b623bf785288c847b107922e17ec5f8edd1 100644 (file)
--- a/plugins/sudoers/sssd.c
+++ b/plugins/sudoers/sssd.c
@@ -41,7 +41,6 @@
 #include <stdint.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "gram.h"
 #include "sudo_lbuf.h"
 #include "sudo_ldap.h"

diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h
index a8139f9e08a6cdcd94a39a4ed699946dc7a922e8..e0f3a39591176c4db0e6d300e7a77927ba6912ee 100644 (file)
--- a/plugins/sudoers/sudoers.h
+++ b/plugins/sudoers/sudoers.h
@@ -38,6 +38,7 @@
 #include "sudo_queue.h"
 #include "defaults.h"
 #include "logging.h"
+#include "parse.h"
 #include "sudo_nss.h"
 #include "sudo_plugin.h"
 #include "sudo_conf.h"

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 48bc999b3cbca618a3d2b1d3c5ff7279e65c1e2c..7f54691492bc73dacc44196fed87d1a88f8761d0 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -47,7 +47,6 @@
 #include "tsgetgrpw.h"
 #include "sudoers.h"
 #include "interfaces.h"
-#include "parse.h"
 #include "sudo_conf.h"
 #include "sudo_lbuf.h"
 #include <gram.h>

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index b42a15f04a9003ad87c950471a9162189e82ff5b..02d8d5b0f246d86b7916545baab559d9d16e86ff 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1993,7 +1993,6 @@ char *yytext;
 #include <errno.h>
 #include <ctype.h>
 #include "sudoers.h"
-#include "parse.h"
 #include "toke.h"
 #include <gram.h>
 #include "sudo_lbuf.h"

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 70e078423c73e493745edae631e6d5dbb6ba53b2..0afacd2f4b4cac753bc213da2003880c07ee1689 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -45,7 +45,6 @@
 #include <errno.h>
 #include <ctype.h>
 #include "sudoers.h"
-#include "parse.h"
 #include "toke.h"
 #include <gram.h>
 #include "sudo_lbuf.h"

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index fccbcc8c60e1474053538cf6b56f4b983b5fa5bf..5e5e70f53e6a57f27bfd73c28986ca516a74720e 100644 (file)
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -37,7 +37,6 @@
 #include <errno.h>
 
 #include "sudoers.h"
-#include "parse.h"
 #include "toke.h"
 #include <gram.h>
 

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index cf787fed3d3d6eff290cc2d99dccf49d6b812e3e..a9963e7270d92983e180949e1282eb3f272e3943 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -59,7 +59,6 @@
 
 #include "sudoers.h"
 #include "interfaces.h"
-#include "parse.h"
 #include "redblack.h"
 #include "sudoers_version.h"
 #include "sudo_conf.h"