From 4262358111fb97820915769bfdb201ad39f24d7c Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 29 Sep 2009 12:41:20 -0400 Subject: [PATCH] Fix SASL mappings --- ipaserver/install/krbinstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index f45075cf2..407be8a39 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -247,9 +247,9 @@ class KrbInstance(service.Service): entry = ipaldap.Entry("cn=Name Only,cn=mapping,cn=sasl,cn=config") entry.setValues("objectclass", "top", "nsSaslMapping") entry.setValues("cn", "Name Only") - entry.setValues("nsSaslMapRegexString", '\(.*\)') + entry.setValues("nsSaslMapRegexString", '^[^:@]+$') entry.setValues("nsSaslMapBaseDNTemplate", self.suffix) - entry.setValues("nsSaslMapFilterTemplate", '(krbPrincipalName=\\1@%s)' % self.realm) + entry.setValues("nsSaslMapFilterTemplate", '(krbPrincipalName=&@%s)' % self.realm) try: self.conn.add_s(entry)