This avoids the need to fix it up again in samba_upgradedns.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Mar 25 13:25:30 CET 2013 on sn-devel-104
"configurationNamingContext","rootDomainNamingContext",
"namingContexts"])
"configurationNamingContext","rootDomainNamingContext",
"namingContexts"])
- names.configdn = current[0]["configurationNamingContext"]
- configdn = str(names.configdn)
- names.schemadn = current[0]["schemaNamingContext"]
+ names.configdn = current[0]["configurationNamingContext"][0]
+ names.schemadn = current[0]["schemaNamingContext"][0]
if not (ldb.Dn(samdb, basedn) == (ldb.Dn(samdb,
current[0]["defaultNamingContext"][0]))):
raise ProvisioningError(("basedn in %s (%s) and from %s (%s)"
if not (ldb.Dn(samdb, basedn) == (ldb.Dn(samdb,
current[0]["defaultNamingContext"][0]))):
raise ProvisioningError(("basedn in %s (%s) and from %s (%s)"
str(current[0]["defaultNamingContext"][0]),
paths.smbconf, basedn)))
str(current[0]["defaultNamingContext"][0]),
paths.smbconf, basedn)))
- names.domaindn=current[0]["defaultNamingContext"]
- names.rootdn=current[0]["rootDomainNamingContext"]
+ names.domaindn=current[0]["defaultNamingContext"][0]
+ names.rootdn=current[0]["rootDomainNamingContext"][0]
names.ncs=current[0]["namingContexts"]
names.dnsforestdn = None
names.dnsdomaindn = None
names.ncs=current[0]["namingContexts"]
names.dnsforestdn = None
names.dnsdomaindn = None
# default site name
res3 = samdb.search(expression="(objectClass=site)",
# default site name
res3 = samdb.search(expression="(objectClass=site)",
- base="CN=Sites," + configdn, scope=ldb.SCOPE_ONELEVEL, attrs=["cn"])
+ base="CN=Sites," + names.configdn, scope=ldb.SCOPE_ONELEVEL, attrs=["cn"])
names.sitename = str(res3[0]["cn"])
# dns hostname and server dn
names.sitename = str(res3[0]["cn"])
# dns hostname and server dn
names.hostname = str(res4[0]["dNSHostName"]).replace("." + names.dnsdomain, "")
server_res = samdb.search(expression="serverReference=%s" % res4[0].dn,
names.hostname = str(res4[0]["dNSHostName"]).replace("." + names.dnsdomain, "")
server_res = samdb.search(expression="serverReference=%s" % res4[0].dn,
- attrs=[], base=configdn)
- names.serverdn = server_res[0].dn
+ attrs=[], base=names.configdn)
+ names.serverdn = str(server_res[0].dn)
# invocation id/objectguid
res5 = samdb.search(expression="(objectClass=*)",
# invocation id/objectguid
res5 = samdb.search(expression="(objectClass=*)",
-def fix_names(pnames):
- """Convert elements to strings from MessageElement
- """
- names = pnames
- names.rootdn = pnames.rootdn[0]
- names.domaindn = pnames.domaindn[0]
- names.configdn = pnames.configdn[0]
- names.schemadn = pnames.schemadn[0]
- names.root_gid = pnames.root_gid
- names.serverdn = str(pnames.serverdn)
- return names
-
-
def convert_dns_rdata(rdata, serial=1):
"""Convert resource records in dnsRecord format
"""
def convert_dns_rdata(rdata, serial=1):
"""Convert resource records in dnsRecord format
"""
paths = get_paths(param, smbconf=lp.configfile)
paths.bind_gid = find_bind_gid()
ldbs = get_ldbs(paths, creds, system_session(), lp)
paths = get_paths(param, smbconf=lp.configfile)
paths.bind_gid = find_bind_gid()
ldbs = get_ldbs(paths, creds, system_session(), lp)
- pnames = find_provision_key_parameters(ldbs.sam, ldbs.secrets, ldbs.idmap,
+ names = find_provision_key_parameters(ldbs.sam, ldbs.secrets, ldbs.idmap,
paths, lp.configfile, lp)
paths, lp.configfile, lp)
- names = fix_names(pnames)
if names.domainlevel < DS_DOMAIN_FUNCTION_2003:
logger.error("Cannot create AD based DNS for OS level < 2003")
if names.domainlevel < DS_DOMAIN_FUNCTION_2003:
logger.error("Cannot create AD based DNS for OS level < 2003")