Index: trunk/server/common/oursrc/execsys/ldapize.pl
===================================================================
--- trunk/server/common/oursrc/execsys/ldapize.pl	(revision 1817)
+++ trunk/server/common/oursrc/execsys/ldapize.pl	(revision 1818)
@@ -37,5 +37,5 @@
     'Net::LDAP::Filter');
 
-my $ldap = Net::LDAP->new("ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/");
+my $ldap = Net::LDAP->new("ldapi://%2fvar%2frun%2fslapd-scripts.socket/");
 $mesg = $ldap->bind();
 $mesg->code && die $mesg->error;
Index: trunk/server/doc/install-ldap
===================================================================
--- trunk/server/doc/install-ldap	(revision 1817)
+++ trunk/server/doc/install-ldap	(revision 1818)
@@ -28,5 +28,5 @@
 
 # Inside cn=config.  These changes definitely require a restart.
-nsslapd-ldapifilepath: /var/run/dirsrv/slapd-scripts.socket
+nsslapd-ldapifilepath: /var/run/slapd-scripts.socket
 nsslapd-ldapilisten: on
 nsslapd-syntaxcheck: off
@@ -51,5 +51,4 @@
 - chown fedora-ds:fedora-ds /var/run/dirsrv
 - chown fedora-ds /etc/dirsrv/keytab
-- chmod 755 /var/run/dirsrv
 - /sbin/service dirsrv start
 - Use ldapvi -b cn=config to add these indexes (8 of them):
Index: trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py
===================================================================
--- trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py	(revision 1817)
+++ trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py	(revision 1818)
@@ -25,5 +25,5 @@
 import sys
 
-ll = ldap.initialize("ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/")
+ll = ldap.initialize("ldapi://%2fvar%2frun%2fslapd-scripts.socket/")
 ll.simple_bind_s("", "")
 
Index: trunk/server/fedora/config/etc/ldap.conf
===================================================================
--- trunk/server/fedora/config/etc/ldap.conf	(revision 1817)
+++ trunk/server/fedora/config/etc/ldap.conf	(revision 1818)
@@ -27,5 +27,5 @@
 #uri ldapi://%2fvar%2frun%2fldapi_sock/
 # Note: %2f encodes the '/' used as directory separator
-uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+uri ldapi://%2fvar%2frun%2fslapd-scripts.socket/
 
 # The LDAP version to use (defaults to 3
Index: trunk/server/fedora/config/etc/nslcd.conf
===================================================================
--- trunk/server/fedora/config/etc/nslcd.conf	(revision 1817)
+++ trunk/server/fedora/config/etc/nslcd.conf	(revision 1818)
@@ -131,5 +131,5 @@
 #map    group  gidNumber        gid
 # This comment prevents repeated auto-migration of settings.
-uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+uri ldapi://%2fvar%2frun%2fslapd-scripts.socket/
 base dc=scripts,dc=mit,dc=edu
 base   group  ou=Groups,dc=scripts,dc=mit,dc=edu
Index: trunk/server/fedora/config/etc/postfix/virtual-alias-domains-ldap.cf
===================================================================
--- trunk/server/fedora/config/etc/postfix/virtual-alias-domains-ldap.cf	(revision 1817)
+++ trunk/server/fedora/config/etc/postfix/virtual-alias-domains-ldap.cf	(revision 1818)
@@ -12,5 +12,5 @@
 # version 3 is necessary to use ldapi.
 
-server_host = ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+server_host = ldapi://%2fvar%2frun%2fslapd-scripts.socket/
 search_base = ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
 query_filter = (&(objectClass=scriptsVhost)(|(scriptsVhostName=%s)(scriptsVhostAlias=%s))(!(scriptsVhostName=scripts.mit.edu)))
Index: trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap.cf
===================================================================
--- trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap.cf	(revision 1817)
+++ trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap.cf	(revision 1818)
@@ -13,5 +13,5 @@
 # necessary to use ldapi.
 
-server_host = ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+server_host = ldapi://%2fvar%2frun%2fslapd-scripts.socket/
 search_base = ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
 query_filter = (&(objectClass=scriptsVhost)(|(scriptsVhostName=%d)(scriptsVhostAlias=%d))(!(scriptsVhostName=scripts.mit.edu)))