X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-tools-cn.git;a=blobdiff_plain;f=functions.sh;h=96d132f2f685aab8044f4f64d70f0942a0101472;hp=24c7cf9209d9d4ce6ba1aeea720d8475922a72d7;hb=5a800b1f6c62a25cc219cf11942ebcc9bbd07e3d;hpb=1d91e1440ee3f097590ddde0d539ea9d25d44854

diff --git a/functions.sh b/functions.sh
index 24c7cf9..96d132f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -438,7 +438,7 @@ cp_db_get() {
   fi
 }
 
-# by ico, Wed, 20 Apr 2005 21:09:54 +0200
+# by ico, Wed, 07 Dec 2011 13:30:02 +0100
 cp_get_ldap_suffix() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
 
@@ -448,22 +448,25 @@ cp_get_ldap_suffix() {
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  if [ ! -f /etc/ldap/slapd.conf ]; then
-    echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2
+  if [ ! -d /etc/ldap/slapd.d/ ]; then
+    echo "cp_get_ldap_suffix: /etc/ldap/slapd.d/: No such directory" >&2
     return 2
   fi
   
-  RET="`awk  '/^suffix/      { exit }
-              END            { gsub(/"/, "", $2); print $2 }' \
-	     < /etc/ldap/slapd.conf`"
+  #RET="`awk  '/^suffix/      { exit }
+  #            END            { gsub(/"/, "", $2); print $2 }' \
+  #	     < /etc/ldap/slapd.conf`"
+
+  RET="`grep -r olcSuffix /etc/ldap/slapd.d/|awk '{print $2}'`"
 
   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
+    echo "cp_get_ldap_suffix: Invalid LDAP suffix in /etc/ldap/slapd.d/" >&2
     return 2
   fi
+
     
-  [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
+  [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.d/" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
 }
@@ -478,15 +481,17 @@ cp_get_ldap_realm() {
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  if [ ! -f /etc/ldap/slapd.conf ]; then
-    echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
+  if [ ! -f /etc/ldap/slapd.d/ ]; then
+    echo "cp_get_ldap_realm: /etc/ldap/slapd.d/: No such directory" >&2
     return 2
   fi
  
   cp_get_ldap_suffix || true
   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 "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.d/" >&2
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
 }
 
 # if fqdn is name.dom3.dom2.dom1.hr, check if this host is MX for