From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Sat, 3 Feb 2018 13:45:39 +0000 (-0700)
Subject: Remove syslog_goodpri and syslog_badpri without a value that causes
X-Git-Tag: SUDO_1_8_23^2~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f31ba6c22f2a0c970ce2ae54fa97705d66859dc4;p=sudo

Remove syslog_goodpri and syslog_badpri without a value that causes
visudo to report an error.
---

diff --git a/plugins/sudoers/regress/sudoers/test21.in b/plugins/sudoers/regress/sudoers/test21.in
index cba6df77a..65416cf29 100644
--- a/plugins/sudoers/regress/sudoers/test21.in
+++ b/plugins/sudoers/regress/sudoers/test21.in
@@ -13,7 +13,6 @@ Defaults	syslog=local5
 Defaults	syslog=local6
 Defaults	syslog=local7
 
-Defaults	syslog_goodpri
 Defaults	!syslog_goodpri
 Defaults	syslog_goodpri=alert
 Defaults	syslog_goodpri=crit
@@ -25,7 +24,6 @@ Defaults	syslog_goodpri=notice
 Defaults	syslog_goodpri=warning
 Defaults	syslog_goodpri=none
 
-Defaults	syslog_badpri
 Defaults	!syslog_badpri
 Defaults	syslog_badpri=alert
 Defaults	syslog_badpri=crit
diff --git a/plugins/sudoers/regress/sudoers/test21.json.ok b/plugins/sudoers/regress/sudoers/test21.json.ok
index 04404733e..78969651c 100644
--- a/plugins/sudoers/regress/sudoers/test21.json.ok
+++ b/plugins/sudoers/regress/sudoers/test21.json.ok
@@ -65,11 +65,6 @@
                 { "syslog": "local7" }
             ]
         },
-        {
-            "Options": [
-                { "syslog_goodpri": true }
-            ]
-        },
         {
             "Options": [
                 { "syslog_goodpri": false }
@@ -120,11 +115,6 @@
                 { "syslog_goodpri": "none" }
             ]
         },
-        {
-            "Options": [
-                { "syslog_badpri": true }
-            ]
-        },
         {
             "Options": [
                 { "syslog_badpri": false }
diff --git a/plugins/sudoers/regress/sudoers/test21.ldif.ok b/plugins/sudoers/regress/sudoers/test21.ldif.ok
index ffb595fc0..b3bede84d 100644
--- a/plugins/sudoers/regress/sudoers/test21.ldif.ok
+++ b/plugins/sudoers/regress/sudoers/test21.ldif.ok
@@ -16,7 +16,6 @@ sudoOption: syslog=local4
 sudoOption: syslog=local5
 sudoOption: syslog=local6
 sudoOption: syslog=local7
-sudoOption: syslog_goodpri
 sudoOption: !syslog_goodpri
 sudoOption: syslog_goodpri=alert
 sudoOption: syslog_goodpri=crit
@@ -27,7 +26,6 @@ sudoOption: syslog_goodpri=info
 sudoOption: syslog_goodpri=notice
 sudoOption: syslog_goodpri=warning
 sudoOption: syslog_goodpri=none
-sudoOption: syslog_badpri
 sudoOption: !syslog_badpri
 sudoOption: syslog_badpri=alert
 sudoOption: syslog_badpri=crit
diff --git a/plugins/sudoers/regress/sudoers/test21.out.ok b/plugins/sudoers/regress/sudoers/test21.out.ok
index a37ad56b3..4aba66729 100644
--- a/plugins/sudoers/regress/sudoers/test21.out.ok
+++ b/plugins/sudoers/regress/sudoers/test21.out.ok
@@ -1,4 +1,4 @@
-Parses OK (problem with defaults entries).
+Parses OK.
 
 Defaults	syslog
 Defaults	!syslog
@@ -13,7 +13,6 @@ Defaults	syslog=local4
 Defaults	syslog=local5
 Defaults	syslog=local6
 Defaults	syslog=local7
-Defaults	syslog_goodpri
 Defaults	!syslog_goodpri
 Defaults	syslog_goodpri=alert
 Defaults	syslog_goodpri=crit
@@ -24,7 +23,6 @@ Defaults	syslog_goodpri=info
 Defaults	syslog_goodpri=notice
 Defaults	syslog_goodpri=warning
 Defaults	syslog_goodpri=none
-Defaults	syslog_badpri
 Defaults	!syslog_badpri
 Defaults	syslog_badpri=alert
 Defaults	syslog_badpri=crit
diff --git a/plugins/sudoers/regress/sudoers/test21.toke.ok b/plugins/sudoers/regress/sudoers/test21.toke.ok
index 779883cca..871584bf3 100644
--- a/plugins/sudoers/regress/sudoers/test21.toke.ok
+++ b/plugins/sudoers/regress/sudoers/test21.toke.ok
@@ -13,7 +13,6 @@ DEFAULTS DEFVAR = WORD(2)
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
 
-DEFAULTS DEFVAR 
 DEFAULTS !DEFVAR 
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
@@ -25,7 +24,6 @@ DEFAULTS DEFVAR = WORD(2)
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
 
-DEFAULTS DEFVAR 
 DEFAULTS !DEFVAR 
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
@@ -36,5 +34,3 @@ DEFAULTS DEFVAR = WORD(2)
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
 DEFAULTS DEFVAR = WORD(2) 
-testsudoers: sudoers:16 no value specified for "syslog_goodpri"
-testsudoers: sudoers:28 no value specified for "syslog_badpri"