mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Todd C. Miller 2018-05-14 09:05:02 -06:00
parent cc3428398a
commit 71e98d9493
25 changed files with 106 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/sudoers/alias.c
View File

@ -32,7 +32,6 @@
#include <errno.h> #include <errno.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "redblack.h" #include "redblack.h"
#include <gram.h> #include <gram.h>

1
plugins/sudoers/cvtsudoers.c
View File

@ -36,7 +36,6 @@
#include <unistd.h> #include <unistd.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "sudoers_version.h" #include "sudoers_version.h"
#include "sudo_conf.h" #include "sudo_conf.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"

1
plugins/sudoers/cvtsudoers_json.c
View File

@ -31,7 +31,6 @@
#include <ctype.h> #include <ctype.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "cvtsudoers.h" #include "cvtsudoers.h"
#include <gram.h> #include <gram.h>

1
plugins/sudoers/cvtsudoers_ldif.c
View File

@ -31,7 +31,6 @@
#include "sudoers.h" #include "sudoers.h"
#include "sudo_ldap.h" #include "sudo_ldap.h"
#include "parse.h"
#include "redblack.h" #include "redblack.h"
#include "cvtsudoers.h" #include "cvtsudoers.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"

1
plugins/sudoers/defaults.c
View File

@ -37,7 +37,6 @@
#include <syslog.h> #include <syslog.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include <gram.h> #include <gram.h>
/* /*

1
plugins/sudoers/filedigest.c
View File

@ -38,7 +38,6 @@
#include <errno.h> #include <errno.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#ifdef HAVE_SHA224UPDATE #ifdef HAVE_SHA224UPDATE
# include <sha2.h> # include <sha2.h>

1
plugins/sudoers/filedigest_gcrypt.c
View File

@ -35,7 +35,6 @@
#include <gcrypt.h> #include <gcrypt.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
unsigned char * unsigned char *
sudo_filedigest(int fd, const char *file, int digest_type, size_t *digest_lenp) sudo_filedigest(int fd, const char *file, int digest_type, size_t *digest_lenp)

1
plugins/sudoers/filedigest_openssl.c
View File

@ -35,7 +35,6 @@
#include <openssl/sha.h> #include <openssl/sha.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
union ANY_CTX { union ANY_CTX {
SHA256_CTX sha256; SHA256_CTX sha256;

1
plugins/sudoers/fmtsudoers.c
View File

@ -28,7 +28,6 @@
#include <time.h> #include <time.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include <gram.h> #include <gram.h>

209
plugins/sudoers/gram.c
View File

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

3
plugins/sudoers/gram.y
View File

@ -45,8 +45,7 @@
#endif /* YYBISON && HAVE_ALLOCA_H && !__GNUC__ */ #endif /* YYBISON && HAVE_ALLOCA_H && !__GNUC__ */
#include <errno.h> #include <errno.h>
#include "sudoers.h" /* XXX */ #include "sudoers.h"
#include "parse.h"
#include "toke.h" #include "toke.h"
/* If we last saw a newline the entry is on the preceding line. */ /* If we last saw a newline the entry is on the preceding line. */

1
plugins/sudoers/ldap.c
View File

@ -54,7 +54,6 @@
#endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "gram.h" #include "gram.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include "sudo_ldap.h" #include "sudo_ldap.h"

1
plugins/sudoers/ldap_conf.c
View File

@ -44,7 +44,6 @@
#endif #endif
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include "sudo_ldap.h" #include "sudo_ldap.h"
#include "sudo_ldap_conf.h" #include "sudo_ldap_conf.h"

1
plugins/sudoers/ldap_util.c
View File

@ -34,7 +34,6 @@
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"
#include "parse.h"
#include "gram.h" #include "gram.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include "sudo_ldap.h" #include "sudo_ldap.h"

1
plugins/sudoers/match.c
View File

@ -61,7 +61,6 @@
#include <errno.h> #include <errno.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include <gram.h> #include <gram.h>
#ifdef HAVE_FNMATCH #ifdef HAVE_FNMATCH

1
plugins/sudoers/parse.c
View File

@ -34,7 +34,6 @@
#include <time.h> #include <time.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include <gram.h> #include <gram.h>

1
plugins/sudoers/policy.c
View File

@ -35,7 +35,6 @@
#include "sudoers.h" #include "sudoers.h"
#include "sudoers_version.h" #include "sudoers_version.h"
#include "interfaces.h" #include "interfaces.h"
#include "parse.h" /* for parse_timeout() */
/* /*
* Info passed in from the sudo front-end. * Info passed in from the sudo front-end.

1
plugins/sudoers/regress/parser/check_addr.c
View File

@ -38,7 +38,6 @@
#define SUDO_ERROR_WRAP 0 #define SUDO_ERROR_WRAP 0
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "interfaces.h" #include "interfaces.h"
__dso_public int main(int argc, char *argv[]); __dso_public int main(int argc, char *argv[]);

1
plugins/sudoers/sssd.c
View File

@ -41,7 +41,6 @@
#include <stdint.h> #include <stdint.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "gram.h" #include "gram.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include "sudo_ldap.h" #include "sudo_ldap.h"

1
plugins/sudoers/sudoers.h
View File

@ -38,6 +38,7 @@
#include "sudo_queue.h" #include "sudo_queue.h"
#include "defaults.h" #include "defaults.h"
#include "logging.h" #include "logging.h"
#include "parse.h"
#include "sudo_nss.h" #include "sudo_nss.h"
#include "sudo_plugin.h" #include "sudo_plugin.h"
#include "sudo_conf.h" #include "sudo_conf.h"

1
plugins/sudoers/testsudoers.c
View File

@ -47,7 +47,6 @@
#include "tsgetgrpw.h" #include "tsgetgrpw.h"
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"
#include "parse.h"
#include "sudo_conf.h" #include "sudo_conf.h"
#include "sudo_lbuf.h" #include "sudo_lbuf.h"
#include <gram.h> #include <gram.h>

1
plugins/sudoers/toke.c
View File

@ -1993,7 +1993,6 @@ char *yytext;
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "toke.h" #include "toke.h"
#include <gram.h> #include <gram.h>
#include "sudo_lbuf.h" #include "sudo_lbuf.h"

1
plugins/sudoers/toke.l
View File

@ -45,7 +45,6 @@
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "toke.h" #include "toke.h"
#include <gram.h> #include <gram.h>
#include "sudo_lbuf.h" #include "sudo_lbuf.h"

1
plugins/sudoers/toke_util.c
View File

@ -37,7 +37,6 @@
#include <errno.h> #include <errno.h>
#include "sudoers.h" #include "sudoers.h"
#include "parse.h"
#include "toke.h" #include "toke.h"
#include <gram.h> #include <gram.h>

1
plugins/sudoers/visudo.c
View File

@ -59,7 +59,6 @@
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"
#include "parse.h"
#include "redblack.h" #include "redblack.h"
#include "sudoers_version.h" #include "sudoers_version.h"
#include "sudo_conf.h" #include "sudo_conf.h"