[augeas-devel] augeas: master - Sudoers: allow del_negate even if no negate_node is found

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=703746800a83b816b88bbbb910df86c415acc607
Commit:        703746800a83b816b88bbbb910df86c415acc607
Parent:        fe0453ce79809a3e194fbf4c7cfe1a9b90fc6460
Author:        Raphael Pinson <raphink at gmail.com>
AuthorDate:    Tue Feb 23 16:53:13 2010 -0800
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Tue Feb 23 16:53:13 2010 -0800

Sudoers: allow del_negate even if no negate_node is found

Fixes bug #106
---
 lenses/sudoers.aug            |    2 +-
 lenses/tests/test_sudoers.aug |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lenses/sudoers.aug b/lenses/sudoers.aug
index 49ed5f8..1030086 100644
--- a/lenses/sudoers.aug
+++ b/lenses/sudoers.aug
@@ -268,7 +268,7 @@ let parameter_flag_kw    = "always_set_home" | "authenticate" | "env_editor"
                          | "shell_noargs" | "stay_setuid" | "targetpw"
                          | "tty_tickets"
 
-let parameter_flag       = [ (del_negate . negate_node)?
+let parameter_flag       = [ del_negate . negate_node?
                                . key parameter_flag_kw ]
 
 (************************************************************************
diff --git a/lenses/tests/test_sudoers.aug b/lenses/tests/test_sudoers.aug
index 3e17ac4..af5db31 100644
--- a/lenses/tests/test_sudoers.aug
+++ b/lenses/tests/test_sudoers.aug
@@ -21,7 +21,7 @@ Cmnd_Alias \
    Cmnd_Alias ICAL = /bin/cat /home/rpinson/.kde/share/apps/korganizer/std.ics
 
 	Defaults at LOCALNET        !lecture, \
-   		tty_tickets,!fqdn
+   \t\t tty_tickets,!fqdn, !!env_reset
 
 Defaults:buildd env_keep+=\"APT_CONFIG DEBIAN_FRONTEND SHELL\"
 
@@ -81,7 +81,8 @@ someuser ALL=(root) NOPASSWD: /usr/bin/python /usr/local/sbin/filterlog -iu\\=ww
           { "type"      = "@LOCALNET" }
 	      { "lecture" { "negate" } }
           { "tty_tickets" }
-          { "fqdn" { "negate" } } }
+          { "fqdn" { "negate" } }
+          { "env_reset" } }
       {}
       { "Defaults"
           { "type"      = ":buildd" }