Gitweb:
http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=9a40fdb470a2b9e3388df248d5a5ecce65ea88ec
Commit: 9a40fdb470a2b9e3388df248d5a5ecce65ea88ec
Parent: 65ef4c8021f2530f5d25fb66464a1255415472ed
Author: David Lutterkort <[email protected]>
AuthorDate: Mon Nov 30 07:55:10 2009 -0800
Committer: David Lutterkort <[email protected]>
CommitterDate: Mon Nov 30 07:55:10 2009 -0800
Krb5: allow v4_name_convert in libdefaults section
Fixes part of ticket #95
---
lenses/krb5.aug | 7 ++++++-
lenses/tests/test_krb5.aug | 23 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/lenses/krb5.aug b/lenses/krb5.aug
index 6d1b735..344bf8a 100644
--- a/lenses/krb5.aug
+++ b/lenses/krb5.aug
@@ -38,7 +38,12 @@ let record (t:string) (e:lens) =
Inifile.record title e
let libdefaults =
- simple_section "libdefaults" /[a-zA-Z0-9_]+/
+ let option = entry (name_re - "v4_name_convert") eq comment in
+ let subsec = [ indent . key /host|plain/ . eq_openbr .
+ (entry name_re eq comment)* . closebr . eol ] in
+ let v4_name_convert = [ indent . key "v4_name_convert" . eq_openbr .
+ subsec* . closebr . eol ] in
+ record "libdefaults" (option|v4_name_convert)
let login =
let keys = /krb[45]_get_tickets|krb4_convert|krb_run_aklog/
diff --git a/lenses/tests/test_krb5.aug b/lenses/tests/test_krb5.aug
index 1c09264..d2a4fef 100644
--- a/lenses/tests/test_krb5.aug
+++ b/lenses/tests/test_krb5.aug
@@ -867,3 +867,26 @@ test Krb5.kdc get "[kdc]
profile = /var/kerberos/krb5kdc/kdc.conf\n" =
{ "kdc"
{ "profile" = "/var/kerberos/krb5kdc/kdc.conf" } }
+
+(* v4_name_convert in libdefaults *)
+test Krb5.libdefaults get "[libdefaults]
+ default_realm = MY.REALM
+ clockskew = 300
+ v4_instance_resolve = false
+ v4_name_convert = {
+ host = {
+ rcmd = host
+ ftp = ftp
+ }
+ plain = {
+ something = something-else
+ }
+ }\n" =
+
+ { "libdefaults"
+ { "default_realm" = "MY.REALM" }
+ { "clockskew" = "300" }
+ { "v4_instance_resolve" = "false" }
+ { "v4_name_convert"
+ { "host" { "rcmd" = "host" } { "ftp" = "ftp" } }
+ { "plain" { "something" = "something-else" } } } }
_______________________________________________
augeas-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/augeas-devel
