Minimalne izmjene u paketu za Debian stretch

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

diff --git a/functions.sh b/functions.sh
index d63d500..37bd113 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -27,7 +27,8 @@ cp_get_ifaddr() {
     return 2
   fi
 
-  ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  #ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
+  ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf($2) }'`"
 
   if [ -z $ifaddr ]; then
     echo "cp_get_ifaddr: $interface: No ip address found" 1>&2
@@ -63,7 +64,8 @@ cp_get_ifmask() {
     return 1
   fi
 
-  ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  #ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
+  ifmask="`/sbin/ifconfig $interface | awk '/netmask /{ printf($4) }'`"
 
   if [ -z "$ifmask" ]; then
     echo "cp_get_ifmask: $interface: No netmask found" 1>&2
@@ -448,31 +450,27 @@ cp_get_ldap_suffix() {
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
+  RET=""
  
   if [ -d /etc/ldap/slapd.d/ ]; then 
-    RET="`grep -r olcSuffix /etc/ldap/slapd.d/|awk '{print $2}'`"
+    RET="`grep -r olcSuffix: /etc/ldap/slapd.d/ | awk '{print $2}' | head -1`"
   elif [ -f /etc/ldap/slapd.conf ]; then
-   RET="`awk  '/^suffix/      { exit }
+    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
+    RET=""
+    echo "cp_get_ldap_suffix: /etc/ldap/slapd.{d/,conf}: No such file or directory" >&2
+    return 2
   fi
 
-
   if [ "`echo $RET | sed 's/,/ /g' | wc -w`" -gt 2 ]; then
     RET=""
     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.d/ or /etc/ldap/slapd.conf" >&2
+  [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.{d/,conf}" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
 }
@@ -487,15 +485,17 @@ cp_get_ldap_realm() {
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  if [ ! -f /etc/ldap/slapd.d/ ]; then
-    echo "cp_get_ldap_realm: /etc/ldap/slapd.d/: No such directory" >&2
+  RET=""
+
+  if [ ! -d /etc/ldap/slapd.d/ -a ! -f /etc/ldap/slapd.conf ]; then
+    echo "cp_get_ldap_realm: /etc/ldap/slapd.{d/,conf}: No such file or 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.d/" >&2
+  [ -z "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.{d/,conf}" >&2
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
 }