[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.10, 1.11

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19092/admin/src/scripts

Modified Files:
	DSCreate.pm.in 
Log Message:
Resolves: #436400
Summary: LDAPI: cleaning up template-ldapi-default.ldif.in and DSCreate.pm.in
Description: Separated auto-bind attributes from the ldapi attributes. Fixed
to store auto-bind attributes in dsel.dif only when auto-bind is enabled.



Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DSCreate.pm.in	13 Mar 2008 21:52:37 -0000	1.10
+++ DSCreate.pm.in	16 May 2008 16:25:54 -0000	1.11
@@ -336,14 +336,14 @@
             $ent->setValues("nsslapd-ldapilisten", "off");
         }
         if ("@enable_autobind@") {
-            $ent->setValues("nsslapd-ldapiautobind", "on");
+            $ent->setValues("nsslapd-ldapiautobind", "off");
+            $ent->setValues("nsslapd-ldapimaprootdn", $inf->{slapd}->{RootDN});
+            $ent->setValues("nsslapd-ldapimaptoentries", "off");
+            $ent->setValues("nsslapd-ldapiuidnumbertype", "uidNumber");
+            $ent->setValues("nsslapd-ldapigidnumbertype", "gidNumber");
+            $ent->setValues("nsslapd-ldapientrysearchbase", $inf->{slapd}->{Suffix});
+            $ent->setValues("nsslapd-ldapiautodnsuffix", "cn=peercred,cn=external,cn=auth");
         }
-        $ent->setValues("nsslapd-ldapimaprootdn", $inf->{slapd}->{RootDN});
-        $ent->setValues("nsslapd-ldapimaptoentries", "off");
-        $ent->setValues("nsslapd-ldapiuidnumbertype", "uidNumber");
-        $ent->setValues("nsslapd-ldapigidnumbertype", "gidNumber");
-        $ent->setValues("nsslapd-ldapientrysearchbase", "dc=example, dc=com");
-        $ent->setValues("nsslapd-ldapiautodnsuffix", "cn=peercred,cn=external,cn=auth");
         if (!$conn->update($ent)) {
             $conn->close();
             return ("error_enabling_feature", "ldapi", $conn->getErrorString());