diff options
| author | Paul Arthur <flowerysong00@yahoo.com> | 2010-12-08 00:43:43 -0500 |
|---|---|---|
| committer | Paul Arthur <flowerysong00@yahoo.com> | 2010-12-08 00:43:43 -0500 |
| commit | e10cd41cf9e9cba050fa222437ececbd27ee22e7 (patch) | |
| tree | 46e0464868a3bbadc0e84d875677642ec95e61df /config | |
| parent | 77311f6f0efcd3c8b28211ea12a47b75f149e86f (diff) | |
| download | ampache-e10cd41cf9e9cba050fa222437ececbd27ee22e7.tar.gz ampache-e10cd41cf9e9cba050fa222437ececbd27ee22e7.tar.bz2 ampache-e10cd41cf9e9cba050fa222437ececbd27ee22e7.zip | |
Clean up LDAP auth and associated config
Log a more useful error if a config entry is missing but LDAP auth is
enabled. Mark required ldap config values clearly and clean up
descriptions.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ampache.cfg.php.dist | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index 1c6e276c..87ac2cef 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -402,44 +402,39 @@ refresh_limit = "60" ; DEFAULT: false ;auto_create = "false" -; LDAP filter string to use +; LDAP filter string to use (required) ; For OpenLDAP use "uid" ; For Microsoft Active Directory (MAD) use "sAMAccountName" ; DEFAULT: null ; ldap_filter = "sAMAccountName" -; LDAP objectclass it's required so if you don't know use * +; LDAP objectclass (required) ; OpanLDAP objectclass = "*" ; MAD objectclass = "organizationalPerson" ; DEFAULT null ;ldap_objectclass = "organizationalPerson" -; if this is the case, fill these in here: +; Initial credentials to bind with for searching (optional) ; DEFAULT: null ;ldap_username = "" ;ldap_password = "" -; NOT YET IMPLEMENTED!! -; This option checks to see if the specified user is in -; a specific ldap group, allowing you to give access based -; on group membership +; Require that the user is in a specific group (optional) ; DEFAULT: null ;ldap_require_group = "cn=yourgroup,ou=yourorg,dc=yoursubdomain,dc=yourdomain,dc=yourtld" -; This is the search dn used to find your user, uid=username is added on to -; This string +; This is the search dn used to find users (required) ; DEFAULT: null ;ldap_search_dn = "ou=People,dc=yoursubdomain,dc=yourdomain,dc=yourtld" -; This is the address of your ldap server +; This is the address of your ldap server (required) ; DEFAULT: null ;ldap_url = "" -; Specify where in your ldap db the following fields are stored: -; (comment out if you don't have them) -; OpenLDAP: ldap_name_field = "cn" +; Attributes where additional user information is stored (optional) +; OpenLDAP ldap_name_field = "cn" ; MAD ldap_name_field = "displayname" -; DEFAULT: [none] +; DEFAULT: null ;ldap_email_field = "mail" ;ldap_name_field = "cn" |