IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-27 16:46:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move our own domain info into cn=etc

Browse Source 
https://fedorahosted.org/freeipa/ticket/2001
This commit is contained in:
Sumit Bose 2011-11-07 11:56:57 +01:00 committed by Simo Sorce
parent 1ffbec9942
commit 9a14fa6c2f
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ipaserver/install/adtrustinstance.py
View File

@ -183,17 +183,24 @@ class ADTRUSTInstance(service.Service):
except errors.NotFound:
pass
try:
self.admin_conn.getEntry(self.trust_dn, ldap.SCOPE_BASE)
except errors.NotFound:
entry = ipaldap.Entry(self.trust_dn)
entry.setValues("objectclass", ["nsContainer"])
entry.setValues("cn", "trusts")
self.admin_conn.add_s(entry)
for new_dn in (self.trust_dn, \
"cn=ad,"+self.trust_dn, \
"cn=ad,cn=etc,"+self.suffix):
try:
self.admin_conn.getEntry(dn, ldap.SCOPE_BASE)
except errors.NotFound:
entry = ipaldap.Entry(dn)
entry.setValues("objectclass", ["nsContainer"])
name = dn.split('=')[1].split(',')[0]
if not name:
print "Cannot extract RDN attribute value from [%s]" % dn
return
entry.setValues("cn", name)
self.admin_conn.addEntry(entry)
entry = ipaldap.Entry(self.smb_dom_dn)
entry.setValues("objectclass", ["sambaDomain", "nsContainer"])
entry.setValues("cn", "ad")
entry.setValues("cn", self.domain_name)
entry.setValues("sambaDomainName", self.netbios_name)
entry.setValues("sambaSID", self.__gen_sid_string())
#TODO: which MAY attributes do we want to set ?
@ -346,7 +353,8 @@ class ADTRUSTInstance(service.Service):
self.smb_dn_pwd = ipautil.ipa_generate_password()
self.trust_dn = "cn=trusts,%s" % self.suffix
self.smb_dom_dn = "cn=ad,%s" % self.trust_dn
self.smb_dom_dn = "cn=%s,cn=ad,cn=etc,%s" % (self.domain_name, \
self.suffix)
self.__setup_sub_dict()