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

Collapse All | Expand All

(-)univention-lib-3.0.26.orig//shell/base.sh (-8 / +8 lines)
 Lines 64-70    Link Here 
64
		local namejoinscript
64
		local namejoinscript
65
		namejoinscript="$1"
65
		namejoinscript="$1"
66
		shift
66
		shift
67
		local role="$(ucr get server/role)"
67
		local role="$(/usr/sbin/univention-config-registry get server/role)"
68
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
68
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
69
			echo "Calling joinscript $namejoinscript ..."
69
			echo "Calling joinscript $namejoinscript ..."
70
			"$joinscript" "$@"
70
			"$joinscript" "$@"
 Lines 124-130    Link Here 
124
124
125
	if [ -x "$joinscript" ] ; then
125
	if [ -x "$joinscript" ] ; then
126
		shift
126
		shift
127
		local role="$(ucr get server/role)"
127
		local role="$(/usr/sbin/univention-config-registry get server/role)"
128
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
128
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
129
			"$joinscript" "$@" && delete_unjoinscript "${joinscript_name}"
129
			"$joinscript" "$@" && delete_unjoinscript "${joinscript_name}"
130
		fi
130
		fi
 Lines 142-148    Link Here 
142
	joinscript="/usr/lib/univention-install/$1"
142
	joinscript="/usr/lib/univention-install/$1"
143
	if [ -x "$joinscript" ] ; then
143
	if [ -x "$joinscript" ] ; then
144
		shift
144
		shift
145
		if [ "$(ucr get server/role)" = "domaincontroller_master" ] ; then
145
		if [ "$(/usr/sbin/univention-config-registry get server/role)" = "domaincontroller_master" ] ; then
146
			"$joinscript" "$@"
146
			"$joinscript" "$@"
147
		fi
147
		fi
148
	fi
148
	fi
 Lines 169-175    Link Here 
169
# fi
169
# fi
170
#
170
#
171
is_domain_controller () {
171
is_domain_controller () {
172
	case "$(ucr get server/role)" in
172
	case "$(/usr/sbin/univention-config-registry get server/role)" in
173
	domaincontroller_master) return 0 ;;
173
	domaincontroller_master) return 0 ;;
174
	domaincontroller_backup) return 0 ;;
174
	domaincontroller_backup) return 0 ;;
175
	domaincontroller_slave) return 0 ;;
175
	domaincontroller_slave) return 0 ;;
 Lines 230-237    Link Here 
230
# create passwort
230
# create passwort
231
#
231
#
232
create_machine_password () {
232
create_machine_password () {
233
	local length="$(ucr get machine/password/length)"
233
	local length="$(/usr/sbin/univention-config-registry get machine/password/length)"
234
	local compl="$(ucr get machine/password/complexity)"
234
	local compl="$(/usr/sbin/univention-config-registry get machine/password/complexity)"
235
	
235
	
236
	if [ -z "$length" ]; then
236
	if [ -z "$length" ]; then
237
		length=20
237
		length=20
 Lines 266-272    Link Here 
266
	ucr_varname="$(echo "$name" | tr [A-Z] [a-z] | sed 's| ||g')"
266
	ucr_varname="$(echo "$name" | tr [A-Z] [a-z] | sed 's| ||g')"
267
	ucr_varname="users/default/$ucr_varname"
267
	ucr_varname="users/default/$ucr_varname"
268
268
269
	result="$(ucr get "$ucr_varname")"
269
	result="$(/usr/sbin/univention-config-registry get "$ucr_varname")"
270
	if [ -n "$result" ]; then
270
	if [ -n "$result" ]; then
271
		echo -n "$result"
271
		echo -n "$result"
272
	else
272
	else
 Lines 285-291    Link Here 
285
	ucr_varname="$(echo "$name" | tr [A-Z] [a-z] | sed 's| ||g')"
285
	ucr_varname="$(echo "$name" | tr [A-Z] [a-z] | sed 's| ||g')"
286
	ucr_varname="groups/default/$ucr_varname"
286
	ucr_varname="groups/default/$ucr_varname"
287
287
288
	result="$(ucr get "$ucr_varname")"
288
	result="$(/usr/sbin/univention-config-registry get "$ucr_varname")"
289
	if [ -n "$result" ]; then
289
	if [ -n "$result" ]; then
290
		echo -n "$result"
290
		echo -n "$result"
291
	else
291
	else
(-)univention-lib-3.0.26.orig//shell/ldap.sh (-8 / +8 lines)
 Lines 142-148    Link Here 
142
		echo "ucs_addServiceToLocalhost: wrong argument number" >&2
142
		echo "ucs_addServiceToLocalhost: wrong argument number" >&2
143
		return 2
143
		return 2
144
	fi
144
	fi
145
	eval "$(ucr shell server/role ldap/hostdn)"
145
	eval "$(/usr/sbin/univention-config-registry shell server/role ldap/hostdn)"
146
	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
146
	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
147
}
147
}
148
148
 Lines 157-163    Link Here 
157
	local servicename="$1"
157
	local servicename="$1"
158
	local modulename="$2"
158
	local modulename="$2"
159
	local hostdn="$3"
159
	local hostdn="$3"
160
	local ldap_base="$(ucr get ldap/base)"
160
	local ldap_base="$(/usr/sbin/univention-config-registry get ldap/base)"
161
	if ! shift 3
161
	if ! shift 3
162
	then
162
	then
163
		echo "ucs_addServiceToHost: wrong argument number" >&2
163
		echo "ucs_addServiceToHost: wrong argument number" >&2
 Lines 187-193    Link Here 
187
		echo "ucs_removeServiceFromLocalhost: wrong argument number" >&2
187
		echo "ucs_removeServiceFromLocalhost: wrong argument number" >&2
188
		return 2
188
		return 2
189
	fi
189
	fi
190
	eval "$(ucr shell server/role ldap/hostdn)"
190
	eval "$(/usr/sbin/univention-config-registry shell server/role ldap/hostdn)"
191
	ucs_removeServiceFromHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
191
	ucs_removeServiceFromHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
192
}
192
}
193
193
 Lines 202-208    Link Here 
202
	local servicename="$1"
202
	local servicename="$1"
203
	local modulename="$2"
203
	local modulename="$2"
204
	local hostdn="$3"
204
	local hostdn="$3"
205
	local ldap_base="$(ucr get ldap/base)"
205
	local ldap_base="$(/usr/sbin/univention-config-registry get ldap/base)"
206
	if ! shift 3
206
	if ! shift 3
207
	then
207
	then
208
		echo "ucs_removeServiceFromHost: wrong argument number" >&2
208
		echo "ucs_removeServiceFromHost: wrong argument number" >&2
 Lines 256-263    Link Here 
256
#
256
#
257
ucs_isServiceUnused () { # <servicename>
257
ucs_isServiceUnused () { # <servicename>
258
	local servicename="$1"
258
	local servicename="$1"
259
	local master="$(ucr get ldap/master)"
259
	local master="$(/usr/sbin/univention-config-registry get ldap/master)"
260
	local port="$(ucr get ldap/master/port)"
260
	local port="$(/usr/sbin/univention-config-registry get ldap/master/port)"
261
261
262
	if ! shift 1
262
	if ! shift 1
263
	then
263
	then
 Lines 328-334    Link Here 
328
	if [ -n "$package_name" ]; then
328
	if [ -n "$package_name" ]; then
329
		package_version=$(dpkg-query -f '${Version}' -W "$package_name")
329
		package_version=$(dpkg-query -f '${Version}' -W "$package_name")
330
	else
330
	else
331
		eval "$(ucr shell '^tests/ucs_registerLDAP/.*')"
331
		eval "$(/usr/sbin/univention-config-registry shell '^tests/ucs_registerLDAP/.*')"
332
		if [ -n "$tests_ucs_registerLDAP_packagename" ] && [ -n "$tests_ucs_registerLDAP_packageversion" ]; then
332
		if [ -n "$tests_ucs_registerLDAP_packagename" ] && [ -n "$tests_ucs_registerLDAP_packageversion" ]; then
333
			package_name="$tests_ucs_registerLDAP_packagename"
333
			package_name="$tests_ucs_registerLDAP_packagename"
334
			package_version="$tests_ucs_registerLDAP_packageversion"
334
			package_version="$tests_ucs_registerLDAP_packageversion"
 Lines 385-391    Link Here 
385
385
386
	cp "$schemaFile" /var/lib/univention-ldap/local-schema/
386
	cp "$schemaFile" /var/lib/univention-ldap/local-schema/
387
387
388
	ucr commit /etc/ldap/slapd.conf
388
	/usr/sbin/univention-config-registry commit /etc/ldap/slapd.conf
389
389
390
	test -x /etc/init.d/slapd && /etc/init.d/slapd crestart
390
	test -x /etc/init.d/slapd && /etc/init.d/slapd crestart
391
}
391
}
(-)univention-lib-3.0.26.orig//shell/ucr.sh (-2 / +2 lines)
 Lines 29-35    Link Here 
29
29
30
is_ucr_true () { # test if UCR variable is "true" or "false"
30
is_ucr_true () { # test if UCR variable is "true" or "false"
31
	local value
31
	local value
32
	value="$(univention-config-registry get "$1")"
32
	value="$(/usr/sbin/univention-config-registry get "$1")"
33
	case "$(echo -n "$value" | tr [:upper:] [:lower:])" in
33
	case "$(echo -n "$value" | tr [:upper:] [:lower:])" in
34
		1|yes|on|true|enable|enabled) return 0 ;;
34
		1|yes|on|true|enable|enabled) return 0 ;;
35
		0|no|off|false|disable|disabled) return 1 ;;
35
		0|no|off|false|disable|disabled) return 1 ;;
 Lines 81-87    Link Here 
81
81
82
	if [ -e /etc/univention/templates/info/"$1" ] ; then
82
	if [ -e /etc/univention/templates/info/"$1" ] ; then
83
	    # unregister info file before moving
83
	    # unregister info file before moving
84
		univention-config-registry unregister "$(basename "$1" .info)"
84
		/usr/sbin/univention-config-registry unregister "$(basename "$1" .info)"
85
	    mv /etc/univention/templates/info/"$1" "/etc/univention/templates/removed/$(basename "$1").$(date +%Y%m%d_%H%M%S_%N)"
85
	    mv /etc/univention/templates/info/"$1" "/etc/univention/templates/removed/$(basename "$1").$(date +%Y%m%d_%H%M%S_%N)"
86
	fi
86
	fi
87
}
87
}
(-)univention-lib-3.0.26.orig//shell/umc.sh (-2 / +2 lines)
 Lines 32-38    Link Here 
32
# <http://www.gnu.org/licenses/>.
32
# <http://www.gnu.org/licenses/>.
33
33
34
34
35
eval "$(ucr shell ldap/base)"
35
eval "$(/usr/sbin/univention-config-registry shell ldap/base)"
36
36
37
BIND_ARGS="$@"
37
BIND_ARGS="$@"
38
38
 Lines 56-62    Link Here 
56
56
57
umc_init () {
57
umc_init () {
58
58
59
	eval "$(ucr shell groups/default/domainadmins groups/default/domainusers)"
59
	eval "$(/usr/sbin/univention-config-registry shell groups/default/domainadmins groups/default/domainusers)"
60
60
61
	# containers
61
	# containers
62
	udm container/cn create $BIND_ARGS --ignore_exists --position cn=univention,$ldap_base --set name=UMC || exit $?
62
	udm container/cn create $BIND_ARGS --ignore_exists --position cn=univention,$ldap_base --set name=UMC || exit $?

Return to bug 29241