Attachment 7080 Details for Bug 39074 – revised_fix_for_bug_34776.patch

[patch] revised_fix_for_bug_34776.patch

revised_fix_for_bug_34776.patch (text/plain), 1.24 KB, created by Arvid Requate on 2015-08-04 12:37:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2015-08-04 12:37:07 CEST

Size: 1.24 KB

patch

obsolete

>Index: umc/python/adtakeover/takeover.py
>===================================================================
>--- umc/python/adtakeover/takeover.py	(Revision 62618)
>+++ umc/python/adtakeover/takeover.py	(Arbeitskopie)
>@@ -1078,10 +1078,14 @@
> 		sysvol_dir = "/var/lib/samba/sysvol"
> 		samdb_domain_dns_name = self.samdb.domain_dns_name()
> 		sam_sysvol_dom_dir = os.path.join(sysvol_dir, samdb_domain_dns_name)
>-		ucs_sysvol_dom_dir = os.path.join(sysvol_dir, ucr["domainname"])
>-		if samdb_domain_dns_name != ucr["domainname"]:
>-			if os.path.isdir(ucs_sysvol_dom_dir) and not os.path.isdir(sam_sysvol_dom_dir):
>-				os.rename(ucs_sysvol_dom_dir, sam_sysvol_dom_dir)
>+		if not os.path.isdir(sam_sysvol_dom_dir):
>+			ucs_sysvol_dom_dir = os.path.join(sysvol_dir, ucr["domainname"])
>+			ucs_sysvol_dom_dir_lower = os.path.join(sysvol_dir, ucr["domainname"].lower())
>+			if os.path.isdir(ucs_sysvol_dom_dir_lower):
>+					os.rename(ucs_sysvol_dom_dir_lower, sam_sysvol_dom_dir)
>+			elif samdb_domain_dns_name != ucr["domainname"]:
>+				if os.path.isdir(ucs_sysvol_dom_dir):
>+					os.rename(ucs_sysvol_dom_dir, sam_sysvol_dom_dir)
> 
> 		msgs = self.samdb.search(base=self.samdb.domain_dn(), scope=samba.ldb.SCOPE_SUBTREE,
> 							expression="(objectClass=groupPolicyContainer)",

Actions: View | Diff

Attachments on bug 39074: 7080