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

Collapse All | Expand All

(-)univention-lib-1.0.80.orig//shell/base.sh (-3 / +3 lines)
 Lines 61-67    Link Here 
61
	joinscript="/usr/lib/univention-install/$1"
61
	joinscript="/usr/lib/univention-install/$1"
62
	if [ -x "$joinscript" ] ; then
62
	if [ -x "$joinscript" ] ; then
63
		shift
63
		shift
64
		local role="$(ucr get server/role)"
64
		local role="$(/usr/sbin/univention-config-registry get server/role)"
65
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
65
		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
66
			"$joinscript" "$@"
66
			"$joinscript" "$@"
67
		fi
67
		fi
 Lines 79-85    Link Here 
79
	joinscript="/usr/lib/univention-install/$1"
79
	joinscript="/usr/lib/univention-install/$1"
80
	if [ -x "$joinscript" ] ; then
80
	if [ -x "$joinscript" ] ; then
81
		shift
81
		shift
82
		if [ "$(ucr get server/role)" = "domaincontroller_master" ] ; then
82
		if [ "$(/usr/sbin/univention-config-registry get server/role)" = "domaincontroller_master" ] ; then
83
			"$joinscript" "$@"
83
			"$joinscript" "$@"
84
		fi
84
		fi
85
	fi
85
	fi
 Lines 106-112    Link Here 
106
# fi
106
# fi
107
#
107
#
108
is_domain_controller () {
108
is_domain_controller () {
109
	role="$(ucr get server/role)"
109
	role="$(/usr/sbin/univention-config-registry get server/role)"
110
	[ "$role" = domaincontroller_master -o "$role" = domaincontroller_backup -o "$role" = domaincontroller_slave ]
110
	[ "$role" = domaincontroller_master -o "$role" = domaincontroller_backup -o "$role" = domaincontroller_slave ]
111
}
111
}
112
112
(-)univention-lib-1.0.80.orig//shell/ldap.sh (-2 / +2 lines)
 Lines 137-143    Link Here 
137
ucs_addServiceToLocalhost () { # <servicename> [<udm-credentials>]
137
ucs_addServiceToLocalhost () { # <servicename> [<udm-credentials>]
138
	local server_role ldap_base ldap_hostdn
138
	local server_role ldap_base ldap_hostdn
139
	local servicename="$1"
139
	local servicename="$1"
140
	eval "$(ucr shell server/role ldap/base ldap/hostdn)"
140
	eval "$(/usr/sbin/univention-config-registry shell server/role ldap/base ldap/hostdn)"
141
	shift
141
	shift
142
	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
142
	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
143
}
143
}
 Lines 153-159    Link Here 
153
	   local servicename="$1"
153
	   local servicename="$1"
154
	   local modulename="$2"
154
	   local modulename="$2"
155
	   local hostdn="$3"
155
	   local hostdn="$3"
156
	   local ldap_base="$(ucr get ldap/base)"
156
	   local ldap_base="$(/usr/sbin/univention-config-registry get ldap/base)"
157
	   if ! shift 3
157
	   if ! shift 3
158
	   then
158
	   then
159
			   echo "ucs_addServiceToHost: wrong argument number" >&2
159
			   echo "ucs_addServiceToHost: wrong argument number" >&2
(-)univention-lib-1.0.80.orig//shell/umc.sh (-1 / +1 lines)
 Lines 31-37    Link Here 
31
# /usr/share/common-licenses/AGPL-3; if not, see
31
# /usr/share/common-licenses/AGPL-3; if not, see
32
# <http://www.gnu.org/licenses/>.
32
# <http://www.gnu.org/licenses/>.
33
33
34
eval "$(ucr shell ldap/base)"
34
eval "$(/usr/sbin/univention-config-registry shell ldap/base)"
35
35
36
BIND_ARGS="$@"
36
BIND_ARGS="$@"
37
37

Return to bug 29241