*/
%{
+#include "config.h"
+
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
const char **cmdargs;
const char **envlist;
};
+ const char **strlist;
const char *str;
};
int lineno;
static int maxrules;
int parse_errors = 0;
-static int obsolete_warned = 0;
static void yyerror(const char *, ...);
static int yylex(void);
%}
%token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TPERSIST TKEEPENV TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV
%token TSTRING
%%
option: TNOPASS {
$$.options = NOPASS;
$$.envlist = NULL;
+ } | TNOLOG {
+ $$.options = NOLOG;
+ $$.envlist = NULL;
} | TPERSIST {
$$.options = PERSIST;
$$.envlist = NULL;
} | TKEEPENV {
$$.options = KEEPENV;
$$.envlist = NULL;
- } | TKEEPENV '{' envlist '}' {
- $$.options = 0;
- if (!obsolete_warned) {
- warnx("keepenv with list is obsolete");
- obsolete_warned = 1;
- }
- $$.envlist = $3.envlist;
- } | TSETENV '{' envlist '}' {
+ } | TSETENV '{' strlist '}' {
$$.options = 0;
- $$.envlist = $3.envlist;
+ $$.envlist = $3.strlist;
} ;
-envlist: /* empty */ {
- $$.envlist = NULL;
- } | envlist TSTRING {
- int nenv = arraylen($1.envlist);
- if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
+strlist: /* empty */ {
+ if (!($$.strlist = calloc(1, sizeof(char *))))
+ errx(1, "can't allocate strlist");
+ } | strlist TSTRING {
+ int nstr = arraylen($1.strlist);
+ if (!($$.strlist = reallocarray($1.strlist, nstr + 2,
sizeof(char *))))
- errx(1, "can't allocate envlist");
- $$.envlist[nenv] = $2.str;
- $$.envlist[nenv + 1] = NULL;
- }
+ errx(1, "can't allocate strlist");
+ $$.strlist[nstr] = $2.str;
+ $$.strlist[nstr + 1] = NULL;
+ } ;
ident: TSTRING {
args: /* empty */ {
$$.cmdargs = NULL;
- } | TARGS argslist {
- $$.cmdargs = $2.cmdargs;
- } ;
-
-argslist: /* empty */ {
- $$.cmdargs = NULL;
- } | argslist TSTRING {
- int nargs = arraylen($1.cmdargs);
- if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2,
- sizeof(char *))))
- errx(1, "can't allocate args");
- $$.cmdargs[nargs] = $2.str;
- $$.cmdargs[nargs + 1] = NULL;
+ } | TARGS strlist {
+ $$.cmdargs = $2.strlist;
} ;
%%
{
va_list va;
+ fprintf(stderr, "doas: ");
va_start(va, fmt);
vfprintf(stderr, fmt, va);
va_end(va);
{ "cmd", TCMD },
{ "args", TARGS },
{ "nopass", TNOPASS },
+ { "nolog", TNOLOG },
{ "persist", TPERSIST },
{ "keepenv", TKEEPENV },
{ "setenv", TSETENV },
}
}
if ((str = strdup(buf)) == NULL)
- err(1, "strdup");
+ err(1, "%s", __func__);
yylval.str = str;
return TSTRING;
}