diff --git a/gestioncof/autocomplete.py b/gestioncof/autocomplete.py index 7caea48b..1146e1c0 100644 --- a/gestioncof/autocomplete.py +++ b/gestioncof/autocomplete.py @@ -56,8 +56,8 @@ def autocomplete(request): # Fetching data from the SPI if hasattr(settings, 'LDAP_SERVER_URL'): # Fetching - ldap_query = '(|{:s})'.format(''.join( - '(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(bit=bit) + ldap_query = '(&{:s})'.format(''.join( + '(|(cn=*{bit:s}*)(uid=*{bit:s}*))'.format(bit=bit) for bit in bits if bit.isalnum() )) if ldap_query != "(|)": diff --git a/kfet/autocomplete.py b/kfet/autocomplete.py index d8582ccb..2dd3c32f 100644 --- a/kfet/autocomplete.py +++ b/kfet/autocomplete.py @@ -75,8 +75,8 @@ def account_create(request): # Fetching data from the SPI if hasattr(settings, 'LDAP_SERVER_URL'): # Fetching - ldap_query = '(|{:s})'.format(''.join( - '(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(bit=word) + ldap_query = '(&{:s})'.format(''.join( + '(|(cn=*{bit:s}*)(uid=*{bit:s}*))'.format(bit=word) for word in search_words if word.isalnum() )) if ldap_query != "(|)":