X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=773e5225ba53d8162be00c17f7d10f1adc9eb683;hb=a0b0241a8a528c25da8763e783b42f43db156f6a;hp=70c914c82dda6717bc53b2237223697ec608c661;hpb=f78745669929584d41cbc8fffb8449d582e45c46;p=carnet-tools-cn.git diff --git a/functions.sh b/functions.sh index 70c914c..773e522 100644 --- a/functions.sh +++ b/functions.sh @@ -83,7 +83,7 @@ cp_get_ifdefault() { addr) RET=`route -n | awk '/^0.0.0.0/{print $2}'` ;; *) echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;; esac - [ -z "$RET" -a "$1" -a "$CP_VERBOSE" ] && echo "cp_get_ifdefault: No default route" >&2 + [ -z "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2 [ -z "$echo_return" ] || echo $RET CP_ECHO_RETURN="$echo_return" [ -z "$RET" ] && return 1 @@ -318,3 +318,55 @@ cp_db_get() { fi } +# by ico, Wed, 20 Apr 2005 21:09:54 +0200 +cp_get_ldap_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 + CP_ECHO_RETURN="" + + [ "$CP_SCRIPT_DEBUG" ] && set -vx + + if [ ! -f /etc/ldap/slapd.conf ]; then + echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2 + return 1 + 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 + return 2 + fi + + [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2 + [ -z "$echo_return" ] || echo $RET + CP_ECHO_RETURN="$echo_return" +} + +# by ico, Wed, 20 Apr 2005 21:09:54 +0200 +cp_get_ldap_realm() { + 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 + CP_ECHO_RETURN="" + + [ "$CP_SCRIPT_DEBUG" ] && set -vx + + if [ ! -f /etc/ldap/slapd.conf ]; then + echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2 + return 1 + 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 "$echo_return" ] || echo $RET + CP_ECHO_RETURN="$echo_return" +}