From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Wed, 20 Apr 2005 19:46:55 +0000 (+0000)
Subject: r52:
X-Git-Tag: debian/3.0.0~54
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=7ea3717ef2e067c66e32d34a1cd42962c424b20f;p=carnet-upgrade.git

r52:
---

diff --git a/functions.sh b/functions.sh
index 81336d4..2f6a09e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -338,5 +338,26 @@ cp_get_ldap_suffix() {
   [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
-  [ -z "$RET" ] && return 1
+}
+
+# by ico, Wed, 20 Apr 2005 21:09:54 +0200
+cp_get_ldap_realm() {
+  local echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
+
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
+  if [ ! -f /etc/ldap/slapd.conf ]; then
+    echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
+    return 1
+  fi
+  
+  RET="`awk /^suffix/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"' | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+
+  [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP REALM in /etc/ldap/slapd.conf" >&2
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
 }