diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2008-05-16 16:25:55 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2008-05-16 16:25:55 +0000 |
| commit | c6f0c0228924cf4984b0de6ce3e8e965a9c2d3ce (patch) | |
| tree | a8404a0190af5ecf1a8372c769d2e34893d1c8bf | |
| parent | 9f49d5494f278f07a0810053eac064f443c0c802 (diff) | |
| download | ds-c6f0c0228924cf4984b0de6ce3e8e965a9c2d3ce.tar.gz ds-c6f0c0228924cf4984b0de6ce3e8e965a9c2d3ce.tar.xz ds-c6f0c0228924cf4984b0de6ce3e8e965a9c2d3ce.zip | |
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.
| -rw-r--r-- | ldap/admin/src/scripts/DSCreate.pm.in | 16 | ||||
| -rw-r--r-- | ldap/ldif/template-ldapi-default.ldif.in | 18 |
2 files changed, 8 insertions, 26 deletions
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index ef0d3dc7..dd12477e 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/ldap/admin/src/scripts/DSCreate.pm.in @@ -336,14 +336,14 @@ sub createConfigFile { $ent->setValues("nsslapd-ldapilisten", "off"); } if ("@enable_autobind@") { - $ent->setValues("nsslapd-ldapiautobind", "on"); - } - $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"); + $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"); + } if (!$conn->update($ent)) { $conn->close(); return ("error_enabling_feature", "ldapi", $conn->getErrorString()); diff --git a/ldap/ldif/template-ldapi-default.ldif.in b/ldap/ldif/template-ldapi-default.ldif.in index 93b76789..3d059158 100644 --- a/ldap/ldif/template-ldapi-default.ldif.in +++ b/ldap/ldif/template-ldapi-default.ldif.in @@ -5,22 +5,4 @@ nsslapd-ldapifilepath: %run_dir%/slapd-%dsid%.socket - replace: nsslapd-ldapilisten nsslapd-ldapilisten: off -- -replace: nsslapd-ldapimaprootdn -nsslapd-ldapimaprootdn: cn=Directory Manager -- -replace: nsslapd-ldapimaptoentries -nsslapd-ldapimaptoentries: off -- -replace: nsslapd-ldapiuidnumbertype -nsslapd-ldapiuidnumbertype: uidNumber -- -replace: nsslapd-ldapigidnumbertype -nsslapd-ldapigidnumbertype: gidNumber -- -replace: nsslapd-ldapientrysearchbase -nsslapd-ldapientrysearchbase: dc=example, dc=com -- -replace: nsslapd-ldapiautodnsuffix -nsslapd-ldapiautodnsuffix: cn=peercred,cn=external,cn=auth |