projects
/
carnet-tools-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r57: rijesio se suffix varijable...
[carnet-tools-cn.git]
/
functions.sh
diff --git
a/functions.sh
b/functions.sh
index
c461a50
..
2ac5791
100644
(file)
--- a/
functions.sh
+++ b/
functions.sh
@@
-333,7
+333,9
@@
cp_get_ldap_suffix() {
return 1
fi
return 1
fi
- RET="`awk /^suffix/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"'`"
+ 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
[ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
[ -z "$echo_return" ] || echo $RET
@@
-354,8
+356,9
@@
cp_get_ldap_realm() {
echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
return 1
fi
echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
return 1
fi
-
- RET="`awk /^suffix/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"' | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+
+ 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
[ -z "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.conf" >&2
[ -z "$echo_return" ] || echo $RET