summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/krbinstance.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-08-27 07:57:07 +0000
committerPetr Viktorin <pviktori@redhat.com>2013-08-27 18:43:20 +0200
commit5a8e326aebe8c25f5a82e95baf762dfc95f244d9 (patch)
tree6da94691e144fc8a2667e8dc9e7edd773b2c0646 /ipaserver/install/krbinstance.py
parente68bef0b1ce3786f896689975c78ffc61f4db970 (diff)
downloadfreeipa.git-5a8e326aebe8c25f5a82e95baf762dfc95f244d9.tar.gz
freeipa.git-5a8e326aebe8c25f5a82e95baf762dfc95f244d9.tar.xz
freeipa.git-5a8e326aebe8c25f5a82e95baf762dfc95f244d9.zip
Fix nsSaslMapping object class before configuring SASL mappings.
This is a workaround for <https://fedorahosted.org/389/ticket/47490>. https://fedorahosted.org/freeipa/ticket/3778
Diffstat (limited to 'ipaserver/install/krbinstance.py')
-rw-r--r--ipaserver/install/krbinstance.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index a16e4d5f..3c59db85 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -252,6 +252,17 @@ class KrbInstance(service.Service):
# we need to remove any existing SASL mappings in the directory as otherwise they
# they may conflict.
+ # FIXME: https://fedorahosted.org/389/ticket/47490
+ entry = self.admin_conn.get_entry(
+ DN(('cn', 'schema')), ['objectClasses'])
+ entry['objectClasses'].append(
+ "( 2.16.840.1.113730.3.2.317 NAME 'nsSaslMapping' "
+ "DESC 'Netscape defined objectclass' SUP top "
+ "MUST ( cn $ nsSaslMapRegexString $ nsSaslMapBaseDNTemplate $ "
+ "nsSaslMapFilterTemplate ) MAY ( nsSaslMapPriority ) "
+ "X-ORIGIN 'Netscape Directory Server' )")
+ self.admin_conn.update_entry(entry)
+
try:
res = self.admin_conn.get_entries(
DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')),