X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=9b549f5430486ec4ff8c04bcf302ad541799deb5;hb=c36c7532f58f6554cce86a585ed83e92784699ff;hp=dc2d45c0c793fb589aac9bb0045f6272b60c589a;hpb=0391d17254435cc342c65e2277edb13c7c9cb093;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index dc2d45c..9b549f5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -328,7 +328,7 @@ cp_mail () {
 To: root
 Subject: $pkg$version package install log
 Date: $(LC_ALL=C /bin/date --rfc-2822)
- 
+
 Hello!
 
 The $pkg package has been successfully installed on your computer.
@@ -337,9 +337,11 @@ is included below.
 
 ----------
 ${CP_NOTICE}----------"
-  
-    echo "$CP_NOTICE" | /usr/sbin/sendmail -t -oi &
-    sleep 1
+
+    if [ -x /usr/sbin/sendmail ]; then
+      echo "$CP_NOTICE" | /usr/sbin/sendmail -t -oi &
+      sleep 1
+    fi
   fi
 }
 
@@ -436,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
 
@@ -446,22 +448,31 @@ 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
-    return 2
+ 
+  if [ -d /etc/ldap/slapd.d/ ]; then 
+    RET="`grep -r olcSuffix /etc/ldap/slapd.d/|awk '{print $2}'`"
+  elif [ -f /etc/ldap/slapd.conf ]; then
+   RET="`awk  '/^suffix/      { exit }
+               END            { gsub(/"/, "", $2); print $2 }' \
+	       < /etc/ldap/slapd.conf`"
+  else
+    if [ ! -d /etc/ldap/slapd.d/ ]; then
+      echo "cp_get_ldap_suffix: /etc/ldap/slapd.d/: No such directory" >&2
+      return 2
+    elif [ ! -f /etc/ldap/slapd.conf ]; then
+      echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2
+      return 2
+    fi
   fi
-  
-  RET="`awk  '/^suffix/      { exit }
-              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
+    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/ or /etc/ldap/slapd.conf" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
 }
@@ -476,15 +487,20 @@ 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 [ ! -d /etc/ldap/slapd.d/ ]; then
+    echo "cp_get_ldap_suffix: /etc/ldap/slapd.d/: No such directory" >&2
+    return 2
+  elif [ ! -f /etc/ldap/slapd.conf ]; then
+    echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&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