Add nolog option to avoid syslog(3)

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 475c0d530d9e5ffb9d153645d54d87ab64f0128c..15c00c128ce11a1a9b9a5e693b358cc7b73393d6 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -73,7 +73,7 @@ arraylen(const char **arr)
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TPERSIST TKEEPENV TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV
 %token TSTRING
 
 %%
@@ -139,6 +139,9 @@ options:    /* none */ {
 option:                TNOPASS {
                        $$.options = NOPASS;
                        $$.envlist = NULL;
+               } | TNOLOG {
+                       $$.options = NOLOG;
+                       $$.envlist = NULL;
                } | TPERSIST {
                        $$.options = PERSIST;
                        $$.envlist = NULL;
@@ -194,6 +197,7 @@ yyerror(const char *fmt, ...)
 {
        va_list va;
 
+       fprintf(stderr, "doas: ");
        va_start(va, fmt);
        vfprintf(stderr, fmt, va);
        va_end(va);
@@ -211,6 +215,7 @@ static struct keyword {
        { "cmd", TCMD },
        { "args", TARGS },
        { "nopass", TNOPASS },
+       { "nolog", TNOLOG },
        { "persist", TPERSIST },
        { "keepenv", TKEEPENV },
        { "setenv", TSETENV },
@@ -330,7 +335,7 @@ eow:
                }
        }
        if ((str = strdup(buf)) == NULL)
-               err(1, "strdup");
+               err(1, "%s", __func__);
        yylval.str = str;
        return TSTRING;
 }