View | Details | Raw Unified | Return to bug 39074
Collapse All | Expand All

(-)umc/python/adtakeover/takeover.py (-4 / +8 lines)
 Lines 1078-1087    Link Here 
1078
		sysvol_dir = "/var/lib/samba/sysvol"
1078
		sysvol_dir = "/var/lib/samba/sysvol"
1079
		samdb_domain_dns_name = self.samdb.domain_dns_name()
1079
		samdb_domain_dns_name = self.samdb.domain_dns_name()
1080
		sam_sysvol_dom_dir = os.path.join(sysvol_dir, samdb_domain_dns_name)
1080
		sam_sysvol_dom_dir = os.path.join(sysvol_dir, samdb_domain_dns_name)
1081
		ucs_sysvol_dom_dir = os.path.join(sysvol_dir, ucr["domainname"])
1081
		if not os.path.isdir(sam_sysvol_dom_dir):
1082
		if samdb_domain_dns_name != ucr["domainname"]:
1082
			ucs_sysvol_dom_dir = os.path.join(sysvol_dir, ucr["domainname"])
1083
			if os.path.isdir(ucs_sysvol_dom_dir) and not os.path.isdir(sam_sysvol_dom_dir):
1083
			ucs_sysvol_dom_dir_lower = os.path.join(sysvol_dir, ucr["domainname"].lower())
1084
				os.rename(ucs_sysvol_dom_dir, sam_sysvol_dom_dir)
1084
			if os.path.isdir(ucs_sysvol_dom_dir_lower):
1085
					os.rename(ucs_sysvol_dom_dir_lower, sam_sysvol_dom_dir)
1086
			elif samdb_domain_dns_name != ucr["domainname"]:
1087
				if os.path.isdir(ucs_sysvol_dom_dir):
1088
					os.rename(ucs_sysvol_dom_dir, sam_sysvol_dom_dir)
1085
1089
1086
		msgs = self.samdb.search(base=self.samdb.domain_dn(), scope=samba.ldb.SCOPE_SUBTREE,
1090
		msgs = self.samdb.search(base=self.samdb.domain_dn(), scope=samba.ldb.SCOPE_SUBTREE,
1087
							expression="(objectClass=groupPolicyContainer)",
1091
							expression="(objectClass=groupPolicyContainer)",

Return to bug 39074