pull up r20316 from trunk

 r20316@cathode-dark-space:  rra | 2008-05-10 23:54:41 -0400
 Ticket: 5544
 Tags: pullup

 Fix a typo in krb5.conf: ldap_server should be ldap_servers, as the
 latter is what the LDAP KDB plugin looks for.

ticket: 5544
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20516 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config-files/krb5.conf.M b/src/config-files/krb5.conf.M
index 92460a79b952b0ad0ddc0f5393b1432e698ad3be..95a3f773a63c7d4d30ed33a51e9f82609fec89db 100644 (file)
--- a/src/config-files/krb5.conf.M
+++ b/src/config-files/krb5.conf.M
@@ -600,7 +600,7 @@ This LDAP specific tag indicates the file containing the stashed passwords for t
 objects used for starting the Kerberos servers. This value is used if no
 service password file is mentioned in the configuration section under dbmodules.
 
-.IP ldap_server
+.IP ldap_servers
 This LDAP specific tag indicates the list of LDAP servers. The list of LDAP servers
 is whitespace-separated. The LDAP server is specified by a LDAP URI.
 This value is used if no LDAP servers are mentioned in the configuration
@@ -641,7 +641,7 @@ as this object.
 This LDAP specific tag indicates the file containing the stashed passwords for the
 objects used for starting the Kerberos servers.
 
-.IP ldap_server
+.IP ldap_servers
 This LDAP specific tag indicates the list of LDAP servers. The list of LDAP servers
 is whitespace-separated. The LDAP server is specified by a LDAP URI.