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

r49:
---

diff --git a/functions.sh b/functions.sh
index fe93a16..81336d4 100644
--- a/functions.sh
+++ b/functions.sh
@@ -83,7 +83,7 @@ cp_get_ifdefault() {
     addr) RET=`route -n | awk '/^0.0.0.0/{print $2}'` ;;
     *)    echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
   esac
-  [ -z "$RET" -a "$1" -a "$CP_VERBOSE" ] && echo "cp_get_ifdefault: No default route" >&2
+  [ -z "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
   [ -z "$RET" ] && return 1
@@ -317,3 +317,26 @@ cp_db_get() {
     esac
   fi
 }
+
+# by ico, Wed, 20 Apr 2005 21:09:54 +0200
+cp_get_ldap_suffix() {
+  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_suffix: /etc/ldap/slapd.conf: No such file" >&2
+    return 1
+  fi
+  
+  RET="`awk /^suffix/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"'`"
+
+  [ -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
+}