From: Ivan Rako Date: Mon, 25 Apr 2005 20:04:58 +0000 (+0000) Subject: r57: rijesio se suffix varijable... X-Git-Tag: debian/3.0.0~49 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=168257cee8b0a76b1ad37b2f8e570ce971ad630f;p=carnet-upgrade.git r57: rijesio se suffix varijable... --- diff --git a/functions.sh b/functions.sh index 0e0068e..2ac5791 100644 --- a/functions.sh +++ b/functions.sh @@ -344,7 +344,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 +358,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