|
 |
46eb58 |
diff -up sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.json.ok.defaults-double-quote-fix sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.json.ok
|
|
|
46eb58 |
--- sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.json.ok.defaults-double-quote-fix 2018-09-24 18:10:37.235000000 +0200
|
|
|
46eb58 |
+++ sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.json.ok 2018-09-24 18:11:40.153000000 +0200
|
|
|
46eb58 |
@@ -34,7 +34,7 @@
|
|
|
46eb58 |
},
|
|
|
46eb58 |
{
|
|
|
46eb58 |
"Binding": [
|
|
|
46eb58 |
- { "username": "%them" }
|
|
|
46eb58 |
+ { "usergroup": "them" }
|
|
|
46eb58 |
],
|
|
|
46eb58 |
"Options": [
|
|
|
46eb58 |
{ "set_home": true }
|
|
|
46eb58 |
@@ -42,7 +42,7 @@
|
|
|
46eb58 |
},
|
|
|
46eb58 |
{
|
|
|
46eb58 |
"Binding": [
|
|
|
46eb58 |
- { "username": "%: non UNIX 0 c" }
|
|
|
46eb58 |
+ { "nonunixgroup": " non UNIX 0 c" }
|
|
|
46eb58 |
],
|
|
|
46eb58 |
"Options": [
|
|
|
46eb58 |
{ "set_home": true }
|
|
|
46eb58 |
@@ -50,7 +50,7 @@
|
|
|
46eb58 |
},
|
|
|
46eb58 |
{
|
|
|
46eb58 |
"Binding": [
|
|
|
46eb58 |
- { "username": "+net" }
|
|
|
46eb58 |
+ { "netgroup": "net" }
|
|
|
46eb58 |
],
|
|
|
46eb58 |
"Options": [
|
|
|
46eb58 |
{ "set_home": true }
|
|
|
46eb58 |
diff -up sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.toke.ok.defaults-double-quote-fix sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.toke.ok
|
|
|
46eb58 |
--- sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.toke.ok.defaults-double-quote-fix 2018-09-24 18:10:25.216000000 +0200
|
|
|
46eb58 |
+++ sudo-1.8.23/plugins/sudoers/regress/sudoers/test2.toke.ok 2018-09-24 18:11:45.213000000 +0200
|
|
|
46eb58 |
@@ -29,9 +29,9 @@ DEFAULTS_HOST BEGINSTR STRBODY ENDSTR WO
|
|
|
46eb58 |
#
|
|
|
46eb58 |
DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
-DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
-DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
-DEFAULTS_USER BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
+DEFAULTS_USER BEGINSTR STRBODY ENDSTR USERGROUP DEFVAR
|
|
|
46eb58 |
+DEFAULTS_USER BEGINSTR STRBODY ENDSTR USERGROUP DEFVAR
|
|
|
46eb58 |
+DEFAULTS_USER BEGINSTR STRBODY ENDSTR NETGROUP DEFVAR
|
|
|
46eb58 |
|
|
|
46eb58 |
#
|
|
|
46eb58 |
DEFAULTS_RUNAS BEGINSTR STRBODY ENDSTR WORD(4) DEFVAR
|
|
|
46eb58 |
diff -up sudo-1.8.23/plugins/sudoers/toke.c.defaults-double-quote-fix sudo-1.8.23/plugins/sudoers/toke.c
|
|
|
46eb58 |
--- sudo-1.8.23/plugins/sudoers/toke.c.defaults-double-quote-fix 2018-04-29 21:59:23.000000000 +0200
|
|
|
46eb58 |
+++ sudo-1.8.23/plugins/sudoers/toke.c 2018-09-24 18:06:15.527000000 +0200
|
|
|
46eb58 |
@@ -2395,7 +2395,7 @@ YY_RULE_SETUP
|
|
|
46eb58 |
LEXTRACE("ERROR "); /* empty string */
|
|
|
46eb58 |
LEXRETURN(ERROR);
|
|
|
46eb58 |
}
|
|
|
46eb58 |
- if (prev_state == INITIAL) {
|
|
|
46eb58 |
+ if (prev_state == INITIAL || prev_state == GOTDEFS) {
|
|
|
46eb58 |
switch (sudoerslval.string[0]) {
|
|
|
46eb58 |
case '%':
|
|
|
46eb58 |
if (sudoerslval.string[1] == '\0' ||
|
|
|
46eb58 |
diff -up sudo-1.8.23/plugins/sudoers/toke.l.defaults-double-quote-fix sudo-1.8.23/plugins/sudoers/toke.l
|
|
|
46eb58 |
--- sudo-1.8.23/plugins/sudoers/toke.l.defaults-double-quote-fix 2018-04-29 21:59:23.000000000 +0200
|
|
|
46eb58 |
+++ sudo-1.8.23/plugins/sudoers/toke.l 2018-09-24 18:06:15.528000000 +0200
|
|
|
46eb58 |
@@ -187,7 +187,7 @@ DEFVAR [a-z_]+
|
|
|
46eb58 |
LEXTRACE("ERROR "); /* empty string */
|
|
|
46eb58 |
LEXRETURN(ERROR);
|
|
|
46eb58 |
}
|
|
|
46eb58 |
- if (prev_state == INITIAL) {
|
|
|
46eb58 |
+ if (prev_state == INITIAL || prev_state == GOTDEFS) {
|
|
|
46eb58 |
switch (sudoerslval.string[0]) {
|
|
|
46eb58 |
case '%':
|
|
|
46eb58 |
if (sudoerslval.string[1] == '\0' ||
|