diff options
-rwxr-xr-x | nixops/ldap_authorized_keys.sh | 2 | ||||
-rwxr-xr-x | nixops/modules/gitolite/gitolite_ldap_groups.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixops/ldap_authorized_keys.sh b/nixops/ldap_authorized_keys.sh index e8d7a64..ceaddbe 100755 --- a/nixops/ldap_authorized_keys.sh +++ b/nixops/ldap_authorized_keys.sh | |||
@@ -45,7 +45,7 @@ clean_key_line() { | |||
45 | } | 45 | } |
46 | 46 | ||
47 | ldap_search() { | 47 | ldap_search() { |
48 | $LDAPSEARCH -h $LDAP_HOST -b $LDAP_BASE -D $LDAP_BIND -w "$LDAP_PASS" -x -o ldif-wrap=no -LLL "$@" | 48 | $LDAPSEARCH -h $LDAP_HOST -ZZ -b $LDAP_BASE -D $LDAP_BIND -w "$LDAP_PASS" -x -o ldif-wrap=no -LLL "$@" |
49 | } | 49 | } |
50 | 50 | ||
51 | ldap_keys() { | 51 | ldap_keys() { |
diff --git a/nixops/modules/gitolite/gitolite_ldap_groups.sh b/nixops/modules/gitolite/gitolite_ldap_groups.sh index 5f7ef6d..7db0da4 100755 --- a/nixops/modules/gitolite/gitolite_ldap_groups.sh +++ b/nixops/modules/gitolite/gitolite_ldap_groups.sh | |||
@@ -7,7 +7,7 @@ ldap_bindpw="$LDAP_PASS" | |||
7 | ldap_searchbase="dc=immae,dc=eu" | 7 | ldap_searchbase="dc=immae,dc=eu" |
8 | ldap_scope="subtree" | 8 | ldap_scope="subtree" |
9 | 9 | ||
10 | ldap_options="-h ${ldap_host} -x -D ${ldap_binddn} -w ${ldap_bindpw} -b ${ldap_searchbase} -s ${ldap_scope}" | 10 | ldap_options="-h ${ldap_host} -ZZ -x -D ${ldap_binddn} -w ${ldap_bindpw} -b ${ldap_searchbase} -s ${ldap_scope}" |
11 | 11 | ||
12 | ldap_filter="(&(memberOf=cn=groups,cn=gitolite,ou=services,dc=immae,dc=eu)(|(member=uid=${uid_param},ou=users,dc=immae,dc=eu)(member=uid=${uid_param},ou=group_users,dc=immae,dc=eu)))" | 12 | ldap_filter="(&(memberOf=cn=groups,cn=gitolite,ou=services,dc=immae,dc=eu)(|(member=uid=${uid_param},ou=users,dc=immae,dc=eu)(member=uid=${uid_param},ou=group_users,dc=immae,dc=eu)))" |
13 | ldap_result=$(ldapsearch ${ldap_options} -LLL "${ldap_filter}" cn | grep 'cn:' | cut -d' ' -f2) | 13 | ldap_result=$(ldapsearch ${ldap_options} -LLL "${ldap_filter}" cn | grep 'cn:' | cut -d' ' -f2) |