Index: server/common/oursrc/whoisd/whoisd.tac
===================================================================
--- server/common/oursrc/whoisd/whoisd.tac	(revision 760)
+++ server/common/oursrc/whoisd/whoisd.tac	(revision 762)
@@ -20,5 +20,6 @@
         self.ldap_base = ldap_base
         self.vhosts = {}
-        self.rescanVhosts()
+        if vhostDir:
+            self.rescanVhosts()
     def rescanVhosts(self):
         newVhosts = {}
@@ -68,5 +69,5 @@
             user = pwd.getpwuid(int(attrs['apacheSuexecUid']))
             if user:
-                attrs['locker'] = user.pw_name
+                attrs['locker'] = user.pw_namep
             else:
                 attrs['locker'] = None
@@ -87,5 +88,5 @@
 
 application = service.Application('whois', uid=99, gid=99)
-factory = WhoisFactory("/etc/httpd/vhosts.d",
+factory = WhoisFactory(None,
     "ldap://localhost", "ou=VirtualHosts,dc=scripts,dc=mit,dc=edu")
 internet.TCPServer(43, factory).setServiceParent(