From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Sun, 24 Apr 2005 21:27:07 +0000 (+0000)
Subject: r56: popravio ono sto je trazio jelly, da awkusa lijepo izgleda, te da
X-Git-Tag: debian/3.0.0~50
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=4283a3ac6ed0f10faf6e9088735227e5d76d105d;p=carnet-upgrade.git

r56: popravio ono sto je trazio jelly, da awkusa lijepo izgleda, te da
cp_get_ldap_realm koristi cp_get_ldap_suffix...
---

diff --git a/functions.sh b/functions.sh
index d94cc14..0e0068e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -333,7 +333,9 @@ cp_get_ldap_suffix() {
     return 1
   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`"
 
   [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
   [ -z "$echo_return" ] || echo $RET
@@ -342,7 +344,7 @@ cp_get_ldap_suffix() {
 
 # by ico, Wed, 20 Apr 2005 21:09:54 +0200
 cp_get_ldap_realm() {
-  local echo_return
+  local echo_return suffix
   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
@@ -354,9 +356,11 @@ cp_get_ldap_realm() {
     echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
     return 1
   fi
-  
-  RET="`awk '/^suffix/{exit}END{gsub(/"/, "", $2); print $2}' \
-        /etc/ldap/slapd.conf | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+ 
+  cp_get_ldap_suffix || true
+  suffix="$RET"
+
+  RET="`echo $suffix | 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