UCS Bug #29873 / Bug #29241

diff -aur univention-lib-1.0.80.orig//shell/base.sh univention-lib-1.0.80/shell/base.sh
--- univention-lib-1.0.80.orig//shell/base.sh	2012-05-24 11:45:56.000000000 +0200
+++ univention-lib-1.0.80/shell/base.sh	2013-01-23 12:41:39.178558410 +0100
@@ -61,7 +61,7 @@
 	joinscript="/usr/lib/univention-install/$1"
 	if [ -x "$joinscript" ] ; then
 		shift
-		local role="$(ucr get server/role)"
+		local role="$(/usr/sbin/univention-config-registry get server/role)"
 		if [ "$role" = "domaincontroller_master" -o "$role" = "domaincontroller_backup" ] ; then
 			"$joinscript" "$@"
 		fi
@@ -79,7 +79,7 @@
 	joinscript="/usr/lib/univention-install/$1"
 	if [ -x "$joinscript" ] ; then
 		shift
-		if [ "$(ucr get server/role)" = "domaincontroller_master" ] ; then
+		if [ "$(/usr/sbin/univention-config-registry get server/role)" = "domaincontroller_master" ] ; then
 			"$joinscript" "$@"
 		fi
 	fi
@@ -106,7 +106,7 @@
 # fi
 #
 is_domain_controller () {
-	role="$(ucr get server/role)"
+	role="$(/usr/sbin/univention-config-registry get server/role)"
 	[ "$role" = domaincontroller_master -o "$role" = domaincontroller_backup -o "$role" = domaincontroller_slave ]
 }
 
diff -aur univention-lib-1.0.80.orig//shell/ldap.sh univention-lib-1.0.80/shell/ldap.sh
--- univention-lib-1.0.80.orig//shell/ldap.sh	2012-02-06 10:28:16.000000000 +0100
+++ univention-lib-1.0.80/shell/ldap.sh	2013-01-23 12:43:21.595694434 +0100
@@ -137,7 +137,7 @@
 ucs_addServiceToLocalhost () { # <servicename> [<udm-credentials>]
 	local server_role ldap_base ldap_hostdn
 	local servicename="$1"
-	eval "$(ucr shell server/role ldap/base ldap/hostdn)"
+	eval "$(/usr/sbin/univention-config-registry shell server/role ldap/base ldap/hostdn)"
 	shift
 	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
 }
@@ -153,7 +153,7 @@
 	   local servicename="$1"
 	   local modulename="$2"
 	   local hostdn="$3"
-	   local ldap_base="$(ucr get ldap/base)"
+	   local ldap_base="$(/usr/sbin/univention-config-registry get ldap/base)"
 	   if ! shift 3
 	   then
 			   echo "ucs_addServiceToHost: wrong argument number" >&2
diff -aur univention-lib-1.0.80.orig//shell/umc.sh univention-lib-1.0.80/shell/umc.sh
--- univention-lib-1.0.80.orig//shell/umc.sh	2012-02-10 18:07:53.000000000 +0100
+++ univention-lib-1.0.80/shell/umc.sh	2013-01-23 12:43:49.329835674 +0100
@@ -31,7 +31,7 @@
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 
-eval "$(ucr shell ldap/base)"
+eval "$(/usr/sbin/univention-config-registry shell ldap/base)"
 
 BIND_ARGS="$@"