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 1817)
@@ -0,0 +1,139 @@
+# This is the configuration file for the LDAP nameservice
+# switch library's nslcd daemon. It configures the mapping
+# between NSS names (see /etc/nsswitch.conf) and LDAP
+# information in the directory.
+# See the manual page nslcd.conf(5) for more information.
+
+# The user and group nslcd should run as.
+uid nslcd
+gid ldap
+
+# The uri pointing to the LDAP server to use for name lookups.
+# Multiple entries may be specified. The address that is used
+# here should be resolvable without using LDAP (obviously).
+#uri ldap://127.0.0.1/
+#uri ldaps://127.0.0.1/
+#uri ldapi://%2fvar%2frun%2fldapi_sock/
+# Note: %2f encodes the '/' used as directory separator
+# uri ldap://127.0.0.1/
+
+# The LDAP version to use (defaults to 3
+# if supported by client library)
+#ldap_version 3
+
+# The distinguished name of the search base.
+# base dc=example,dc=com
+
+# The distinguished name to bind to the server with.
+# Optional: default is to bind anonymously.
+#binddn cn=proxyuser,dc=example,dc=com
+
+# The credentials to bind with.
+# Optional: default is no credentials.
+# Note that if you set a bindpw you should check the permissions of this file.
+#bindpw secret
+
+# The distinguished name to perform password modifications by root by.
+#rootpwmoddn cn=admin,dc=example,dc=com
+
+# The default search scope.
+#scope sub
+#scope one
+#scope base
+
+# Customize certain database lookups.
+#base   group  ou=Groups,dc=example,dc=com
+#base   passwd ou=People,dc=example,dc=com
+#base   shadow ou=People,dc=example,dc=com
+#scope  group  onelevel
+#scope  hosts  sub
+
+# Bind/connect timelimit.
+#bind_timelimit 30
+
+# Search timelimit.
+#timelimit 30
+
+# Idle timelimit. nslcd will close connections if the
+# server has not been contacted for the number of seconds.
+#idle_timelimit 3600
+
+# Use StartTLS without verifying the server certificate.
+#ssl start_tls
+#tls_reqcert never
+
+# CA certificates for server certificate verification
+#tls_cacertdir /etc/ssl/certs
+#tls_cacertfile /etc/ssl/ca.cert
+
+# Seed the PRNG if /dev/urandom is not provided
+#tls_randfile /var/run/egd-pool
+
+# SSL cipher suite
+# See man ciphers for syntax
+#tls_ciphers TLSv1
+
+# Client certificate and key
+# Use these, if your server requires client authentication.
+#tls_cert
+#tls_key
+
+# NDS mappings
+#map group uniqueMember member
+
+# Mappings for Services for UNIX 3.5
+#filter passwd (objectClass=User)
+#map    passwd uid              msSFU30Name
+#map    passwd userPassword     msSFU30Password
+#map    passwd homeDirectory    msSFU30HomeDirectory
+#map    passwd homeDirectory    msSFUHomeDirectory
+#filter shadow (objectClass=User)
+#map    shadow uid              msSFU30Name
+#map    shadow userPassword     msSFU30Password
+#filter group  (objectClass=Group)
+#map    group  uniqueMember     msSFU30PosixMember
+
+# Mappings for Services for UNIX 2.0
+#filter passwd (objectClass=User)
+#map    passwd uid              msSFUName
+#map    passwd userPassword     msSFUPassword
+#map    passwd homeDirectory    msSFUHomeDirectory
+#map    passwd gecos            msSFUName
+#filter shadow (objectClass=User)
+#map    shadow uid              msSFUName
+#map    shadow userPassword     msSFUPassword
+#map    shadow shadowLastChange pwdLastSet
+#filter group  (objectClass=Group)
+#map    group  uniqueMember     posixMember
+
+# Mappings for Active Directory
+#pagesize 1000
+#referrals off
+#filter passwd (&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*))
+#map    passwd uid              sAMAccountName
+#map    passwd homeDirectory    unixHomeDirectory
+#map    passwd gecos            displayName
+#filter shadow (&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*))
+#map    shadow uid              sAMAccountName
+#map    shadow shadowLastChange pwdLastSet
+#filter group  (objectClass=group)
+#map    group  uniqueMember     member
+
+# Mappings for AIX SecureWay
+#filter passwd (objectClass=aixAccount)
+#map    passwd uid              userName
+#map    passwd userPassword     passwordChar
+#map    passwd uidNumber        uid
+#map    passwd gidNumber        gid
+#filter group  (objectClass=aixAccessGroup)
+#map    group  cn               groupName
+#map    group  uniqueMember     member
+#map    group  gidNumber        gid
+# This comment prevents repeated auto-migration of settings.
+uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
+base dc=scripts,dc=mit,dc=edu
+base   group  ou=Groups,dc=scripts,dc=mit,dc=edu
+base   passwd ou=People,dc=scripts,dc=mit,dc=edu
+timelimit 120
+bind_timelimit 120
+idle_timelimit 3600
Index: unk/server/fedora/config/etc/nss-ldapd.conf
===================================================================
--- /trunk/server/fedora/config/etc/nss-ldapd.conf	(revision 1816)
+++ 	(revision )
@@ -1,134 +1,0 @@
-# This is the configuration file for the LDAP nameservice
-# switch library's nslcd daemon. It configures the mapping
-# between NSS names (see /etc/nsswitch.conf) and LDAP
-# information in the directory.
-# See the manual page nss-ldapd.conf(5) for more information.
-
-# The uri pointing to the LDAP server to use for name lookups.
-# Multiple entries may be specified. The address that is used
-# here should be resolvable without using LDAP (obviously).
-#uri ldap://127.0.0.1/
-#uri ldaps://127.0.0.1/
-#uri ldapi://%2fvar%2frun%2fldapi_sock/
-# Note: %2f encodes the '/' used as directory separator
-# uri ldap://127.0.0.1/
-
-# The LDAP version to use (defaults to 3
-# if supported by client library)
-#ldap_version 3
-
-# The distinguished name of the search base.
-# base dc=example,dc=com
-
-# The distinguished name to bind to the server with.
-# Optional: default is to bind anonymously.
-#binddn cn=proxyuser,dc=example,dc=com
-
-# The credentials to bind with.
-# Optional: default is no credentials.
-# Note that if you set a bindpw you should check the permissions of this file.
-#bindpw secret
-
-# The default search scope.
-#scope sub
-#scope one
-#scope base
-
-# Customize certain database lookups.
-#base   group  ou=Groups,dc=example,dc=com
-#base   passwd ou=People,dc=example,dc=com
-#base   shadow ou=People,dc=example,dc=com
-#scope  group  onelevel
-#scope  hosts  sub
-
-# Bind/connect timelimit.
-#bind_timelimit 30
-
-# Search timelimit.
-#timelimit 30
-
-# Idle timelimit. nslcd will close connections if the
-# server has not been contacted for the number of seconds.
-#idle_timelimit 3600
-
-# Use StartTLS without verifying the server certificate.
-#ssl start_tls
-#tls_reqcert never
-
-# CA certificates for server certificate verification
-#tls_cacertdir /etc/ssl/certs
-#tls_cacertfile /etc/ssl/ca.cert
-
-# Seed the PRNG if /dev/urandom is not provided
-#tls_randfile /var/run/egd-pool
-
-# SSL cipher suite
-# See man ciphers for syntax
-#tls_ciphers TLSv1
-
-# Client certificate and key
-# Use these, if your server requires client authentication.
-#tls_cert
-#tls_key
-
-# NDS mappings
-#map group uniqueMember member
-
-# Mappings for Services for UNIX 3.5
-#filter passwd (objectClass=User)
-#map    passwd uid              msSFU30Name
-#map    passwd userPassword     msSFU30Password
-#map    passwd homeDirectory    msSFU30HomeDirectory
-#map    passwd homeDirectory    msSFUHomeDirectory
-#filter shadow (objectClass=User)
-#map    shadow uid              msSFU30Name
-#map    shadow userPassword     msSFU30Password
-#filter group  (objectClass=Group)
-#map    group  uniqueMember     msSFU30PosixMember
-
-# Mappings for Services for UNIX 2.0
-#filter passwd (objectClass=User)
-#map    passwd uid              msSFUName
-#map    passwd userPassword     msSFUPassword
-#map    passwd homeDirectory    msSFUHomeDirectory
-#map    passwd cn               msSFUName
-#filter shadow (objectClass=User)
-#map    shadow uid              msSFUName
-#map    shadow userPassword     msSFUPassword
-#map    shadow shadowLastChange pwdLastSet
-#filter group  (objectClass=Group)
-#map    group  uniqueMember     posixMember
-
-# Mappings for Active Directory
-#pagesize 1000
-#referrals off
-#filter passwd (&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*))
-#map    passwd uid              sAMAccountName
-#map    passwd homeDirectory    unixHomeDirectory
-#map    passwd gecos            displayName
-#filter shadow (&(objectClass=user)(!(objectClass=computer))(uidNumber=*)(unixHomeDirectory=*))
-#map    shadow uid              sAMAccountName
-#map    shadow shadowLastChange pwdLastSet
-#filter group  (objectClass=group)
-#map    group  uniqueMember     member
-
-# Mappings for AIX SecureWay
-#filter passwd (objectClass=aixAccount)
-#map    passwd uid              userName
-#map    passwd userPassword     passwordChar
-#map    passwd uidNumber        uid
-#map    passwd gidNumber        gid
-#filter group  (objectClass=aixAccessGroup)
-#map    group  cn               groupName
-#map    group  uniqueMember     member
-#map    group  gidNumber        gid
-uid nslcd
-gid ldap
-# This comment prevents repeated auto-migration of settings from /etc/ldap.conf.
-uri ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/
-base dc=scripts,dc=mit,dc=edu
-timelimit 120
-bind_timelimit 120
-idle_timelimit 3600
-base   group  ou=Groups,dc=scripts,dc=mit,dc=edu
-base   passwd ou=People,dc=scripts,dc=mit,dc=edu
