r58: dodao provjeru krivog ldap suffixa...

[carnet-tools-cn.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 0e0068e..773e522 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -337,6 +337,12 @@ cp_get_ldap_suffix() {
               END            { gsub(/"/, "", $2); print $2 }' \
             < /etc/ldap/slapd.conf`"
 
+  if [ "`echo $RET | sed 's/,/ /g' | wc -w`" -gt 2 ]; then
+    RET=""
+    echo "cp_get_ldap_suffix: Invalid LDAP suffix in /etc/ldap/slapd.conf" >&2
+    return 2
+  fi
+    
   [ -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"
@@ -344,7 +350,7 @@ cp_get_ldap_suffix() {
 
 # by ico, Wed, 20 Apr 2005 21:09:54 +0200
 cp_get_ldap_realm() {
-  local echo_return 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
@@ -358,9 +364,7 @@ cp_get_ldap_realm() {
   fi
  
   cp_get_ldap_suffix || true
-  suffix="$RET"
-
-  RET="`echo $suffix | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+  RET="`echo $RET | awk -F, '{print $1}' | awk -F= '{print $2}'`"
 
   [ -z "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.conf" >&2
   [ -z "$echo_return" ] || echo $RET