Exclude users with accountStatus set from the search.

diff --git a/debian/changelog b/debian/changelog
index e06d63c..1f75f2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ userdir-ldap-cgi (0.3.38~20130906+1+nmu1) UNRELEASED; urgency=low
   * rename voipPassword to rtcPassword 
   * store as HA1 hash rather than as plaintext
 
+  [ Tollef Fog Heen ]
+  * Exclude users with accountStatus set from the search.
+
  -- Luca Filipozzi <lfilipoz@emyr.net>  Thu, 16 Jan 2014 23:22:03 +0000
 
 userdir-ldap-cgi (0.3.37) unstable; urgency=low

diff --git a/search.cgi b/search.cgi
index fade2a7..3769538 100755 (executable)
--- a/search.cgi
+++ b/search.cgi
@@ -61,7 +61,7 @@ if (!$dosearch) {
 
   # go through %searchdata and pull out all the search criteria the user
   # specified...
-  my $filter = "(objectclass=inetOrgPerson)";
+  my $filter = "(objectclass=inetOrgPerson)(!(accountStatus=*))";
   foreach (keys(%searchdata)) {
     if ($query->param($searchdata{$_}{formname})) {    
       if ($query->param($searchdata{$_}{fuzzy})) {