View | Details | Raw Unified | Return to bug 40419 | Differences between
and this patch

Collapse All | Expand All

(-)a/services/univention-s4-connector/97univention-s4-connector.inst (-13 / +16 lines)
 Lines 168-174   fi Link Here 
168
if [ -z "$s4connector_dc" ] \
168
if [ -z "$s4connector_dc" ] \
169
	|| [ "$s4connector_dc" = "$hostname" ]; then
169
	|| [ "$s4connector_dc" = "$hostname" ]; then
170
170
171
	## we are first or only system to provide this service
171
	##
172
	## This branch runs in case
173
	##   a) we are first system to provide this service
174
	## or
175
	##   b) connector/s4/allow/secondary is true
176
	##
177
	## Note that connector/s4/allow/secondary is set in these cases:
178
	## 1. automatically on UCS@school Samba/AD Slave PDCs
179
	## 2. manually on Multischool Master where S4-Connector was installed
180
	##    later, after UCS@school Samba/AD Slave PDCs have been joined.
181
	##
172
182
173
	LDB_URI="tdb:///var/lib/samba/private/sam.ldb"
183
	LDB_URI="tdb:///var/lib/samba/private/sam.ldb"
174
184
 Lines 288-306   if [ -z "$s4connector_dc" ] \ Link Here 
288
298
289
	# Restart the connector to use the new values for connector/s4/poll/sleep and connector/s4/retryrejected
299
	# Restart the connector to use the new values for connector/s4/poll/sleep and connector/s4/retryrejected
290
	/etc/init.d/univention-s4-connector restart
300
	/etc/init.d/univention-s4-connector restart
291
else
292
	##
293
	## This branch runs in case
294
	##   a) we are first system to provide this service
295
	## or
296
	##   b) connector/s4/allow/secondary is true
297
	##
298
	## Note that connector/s4/allow/secondary is set in these cases:
299
	## 1. automatically on UCS@school Samba/AD Slave PDCs
300
	## 2. manually on Multischool Master where S4-Connector was installed
301
	##    later, after UCS@school Samba/AD Slave PDCs have been joined.
302
	##
303
301
302
	if is_ucr_true 'connector/s4/allow/secondary'; then
303
		/usr/share/univention-s4-connector/resync_object_from_ucs.py \
304
				   "$ldap_hostdn"
305
	fi
306
else
304
	if this_is_initial_or_rejoin \
307
	if this_is_initial_or_rejoin \
305
		&& this_host_is_not_registered_as_s4_connector; then
308
		&& this_host_is_not_registered_as_s4_connector; then
306
		## Don't autostart S4 Connector on DC Backups.
309
		## Don't autostart S4 Connector on DC Backups.

Return to bug 40419