Index: /server/common/oursrc/execsys/ldapize.pl
===================================================================
--- /server/common/oursrc/execsys/ldapize.pl	(revision 827)
+++ /server/common/oursrc/execsys/ldapize.pl	(revision 828)
@@ -12,9 +12,12 @@
 
 # oh my gosh Net::LDAP::Filter SUCKS
-my $filter = bless({or =>
-    [{equalityMatch => {attributeDesc  => 'scriptsVhostName',
-                        assertionValue => $hostname}},
-     {equalityMatch => {attributeDesc  => 'scriptsVhostAlias',
-                        assertionValue => $hostname}}]},
+my $filter = bless({and =>
+    [{equalityMatch => {attributeDesc  => 'objectClass',
+                        assertionValue => 'scriptsVhost'}},
+     {or =>
+         [{equalityMatch => {attributeDesc  => 'scriptsVhostName',
+                             assertionValue => $hostname}},
+          {equalityMatch => {attributeDesc  => 'scriptsVhostAlias',
+                             assertionValue => $hostname}}]}]},
     'Net::LDAP::Filter');