[augeas-devel] augeas: master - Group: allow empty password field

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=0ca122e86130aa4638a7ff086739697936dcace8
Commit:        0ca122e86130aa4638a7ff086739697936dcace8
Parent:        112e9433c3c387f9223d9f770765e539b1897c8f
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Mon Nov 30 07:27:22 2009 -0800
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Mon Nov 30 07:27:22 2009 -0800

Group: allow empty password field

Fixes part of ticket #95
---
 lenses/group.aug            |    3 ++-
 lenses/tests/test_group.aug |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lenses/group.aug b/lenses/group.aug
index 444648e..3f505f7 100644
--- a/lenses/group.aug
+++ b/lenses/group.aug
@@ -23,6 +23,7 @@ let comma      = Sep.comma
 let sto_to_spc = store Rx.space_in
 
 let word    = Rx.word
+let password = /[A-Za-z0-9_.-]*/
 let integer = Rx.integer
 
 (************************************************************************
@@ -31,7 +32,7 @@ let integer = Rx.integer
 
 let user      = [ label "user" . store word ]
 let user_list = Build.opt_list user comma
-let params    = [ label "password" . store word    . colon ]
+let params    = [ label "password" . store password  . colon ]
                 . [ label "gid"      . store integer . colon ]
                 . user_list?
 let entry     = Build.key_value_line word colon params
diff --git a/lenses/tests/test_group.aug b/lenses/tests/test_group.aug
index 160548b..efd68c6 100644
--- a/lenses/tests/test_group.aug
+++ b/lenses/tests/test_group.aug
@@ -18,3 +18,10 @@ test Group.lns get conf =
      { "gid" = "113" }
      { "user" = "bill"}
      { "user" = "martha"} }
+
+(* Password field can be empty *)
+test Group.lns get "root::0:root\n" =
+  { "root"
+    { "password" = "" }
+    { "gid" = "0" }
+    { "user" = "root" } }