Attachment 10048 Details for Bug 47630 – set_samba4_ldap_base_from_ad.diff

[patch] set_samba4_ldap_base_from_ad.diff

set_samba4_ldap_base_from_ad.diff (text/plain), 1.44 KB, created by Arvid Requate on 2019-05-28 20:54:37 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2019-05-28 20:54:37 CEST

Size: 1.44 KB

patch

obsolete

>diff --git a/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py b/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
>index d043a29d20..6fa980a101 100644
>--- a/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
>+++ b/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
>@@ -911,6 +911,8 @@ class AD_Takeover():
> 			run_and_output_to_log(["univention-config-registry", "set",
> 				"nameserver1/local=%s" % nameserver1_orig,
> 				"nameserver1=%s" % self.ad_server_ip,
>+				"kerberos/realm=%s" % SOMETHING_LOOKED_UP_FROM_AD_THE_SERVER,
>+				"windows/domain=%s" % self.ad_netbios_domain,
> 				"directory/manager/web/modules/users/user/properties/username/syntax=string",
> 				"directory/manager/web/modules/groups/group/properties/name/syntax=string",
> 				"dns/backend=ldap"], log.debug)
>@@ -1026,6 +1028,10 @@ class AD_Takeover():
> 			os.rename(BACKUP_DIR, "%s.bak" % BACKUP_DIR)
> 			os.mkdir(BACKUP_DIR)
> 
>+		# Read the current value of samba4/ldap/base that has been set by 96univention-samba4.inst
>+		self.ucr.load()
>+		univention.admin.configRegistry.load()  # otherwise the modules do not use the new syntax
>+
> 		# Rewrite domain SID in OpenLDAP sambaDomain object
> 		self.ad_domainsid = None
> 		self.samdb = SamDB(os.path.join(SAMBA_PRIVATE_DIR, "sam.ldb"), session_info=system_session(self.lp), lp=self.lp)

Actions: View | Diff

Attachments on bug 47630: 10048