Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jiri Hruska
2013-08-30 07:32:40 +02:00
+2 -2
View File
@@ -62,7 +62,7 @@ Define list of your LDAP servers with required user/group requirements:
binddn_passwd LDAPPASSWORD; binddn_passwd LDAPPASSWORD;
group_attribute uniquemember; group_attribute uniquemember;
group_attribute_is_dn on; group_attribute_is_dn on;
require user_valid; require valid_user;
} }
ldap_server test2 { ldap_server test2 {
@@ -71,7 +71,7 @@ Define list of your LDAP servers with required user/group requirements:
binddn_passwd LDAPPASSWORD; binddn_passwd LDAPPASSWORD;
group_attribute uniquemember; group_attribute uniquemember;
group_attribute_is_dn on; group_attribute_is_dn on;
require user_valid; require valid_user;
} }
``` ```