Attachment 9276 Details for Bug 40419 – bug40419-proposal1.patch

[patch] bug40419-proposal1.patch

bug40419-proposal1.patch (text/plain), 1.83 KB, created by Arvid Requate on 2017-11-07 16:32:41 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2017-11-07 16:32:41 CET

Size: 1.83 KB

patch

obsolete

>diff --git a/services/univention-s4-connector/97univention-s4-connector.inst b/services/univention-s4-connector/97univention-s4-connector.inst
>index 735b531528..ce94e723db 100644
>--- a/services/univention-s4-connector/97univention-s4-connector.inst
>+++ b/services/univention-s4-connector/97univention-s4-connector.inst
>@@ -168,7 +168,17 @@ fi
> if [ -z "$s4connector_dc" ] \
> 	|| [ "$s4connector_dc" = "$hostname" ]; then
> 
>-	## we are first or only system to provide this service
>+	##
>+	## This branch runs in case
>+	##   a) we are first system to provide this service
>+	## or
>+	##   b) connector/s4/allow/secondary is true
>+	##
>+	## Note that connector/s4/allow/secondary is set in these cases:
>+	## 1. automatically on UCS@school Samba/AD Slave PDCs
>+	## 2. manually on Multischool Master where S4-Connector was installed
>+	##    later, after UCS@school Samba/AD Slave PDCs have been joined.
>+	##
> 
> 	LDB_URI="tdb:///var/lib/samba/private/sam.ldb"
> 
>@@ -288,19 +298,12 @@ if [ -z "$s4connector_dc" ] \
> 
> 	# Restart the connector to use the new values for connector/s4/poll/sleep and connector/s4/retryrejected
> 	/etc/init.d/univention-s4-connector restart
>-else
>-	##
>-	## This branch runs in case
>-	##   a) we are first system to provide this service
>-	## or
>-	##   b) connector/s4/allow/secondary is true
>-	##
>-	## Note that connector/s4/allow/secondary is set in these cases:
>-	## 1. automatically on UCS@school Samba/AD Slave PDCs
>-	## 2. manually on Multischool Master where S4-Connector was installed
>-	##    later, after UCS@school Samba/AD Slave PDCs have been joined.
>-	##
> 
>+	if is_ucr_true 'connector/s4/allow/secondary'; then
>+		/usr/share/univention-s4-connector/resync_object_from_ucs.py \
>+				   "$ldap_hostdn"
>+	fi
>+else
> 	if this_is_initial_or_rejoin \
> 		&& this_host_is_not_registered_as_s4_connector; then
> 		## Don't autostart S4 Connector on DC Backups.

Actions: View | Diff

Attachments on bug 40419: 7402 | 7717 | 9275 | 9276