X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=81336d43ba88d45f74385658b14261b1a77f880d;hb=1840032a35143e2a12db3172a7de62a6d38278f0;hp=a818b344f13a56608a71a26a90612849f45c0dae;hpb=01968242e3b13b6f0d59e35e612a824780927ab0;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index a818b34..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
@@ -318,18 +318,25 @@ cp_db_get() {
   fi
 }
 
-# by ddzeko, Tue, 05 Apr 2005 15:47:37 +0200
-# - check is the script run by effective root
-cp_check_root() {
-  local euid
-  euid=`awk 'BEGIN{print PROCINFO["euid"]}'`
-  case "$euid" in
-    0)  RET=y  
-        return 0   ;;
-    ?*) RET=n
-        return 1   ;;
-    *)  RET=""
-        echo "cp_check_root: cannot determine euid" 2>&1 
-        ;;
-  esac
+# 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
 }