projects
/
mirror
/
userdir-ldap-cgi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5cea731
)
Exclude users with accountStatus set from the search.
author
Tollef Fog Heen
<tfheen@err.no>
Thu, 20 Mar 2014 19:02:28 +0000
(20:02 +0100)
committer
Tollef Fog Heen
<tfheen@err.no>
Thu, 20 Mar 2014 19:02:28 +0000
(20:02 +0100)
debian/changelog
patch
|
blob
|
history
search.cgi
patch
|
blob
|
history
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
* 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
-- 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...
# 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})) {
foreach (keys(%searchdata)) {
if ($query->param($searchdata{$_}{formname})) {
if ($query->param($searchdata{$_}{fuzzy})) {