summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-12-20 16:52:43 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-12-20 16:52:43 +0000
commitd8ea07a04acc03160ac73f5db2a9249890e5fd13 (patch)
tree63e0dfedbfc9565a265cb342da405cd79b4ff341 /config
parent69c56f829da3fc44e6dbcc14c364901b86f55421 (diff)
downloadampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.tar.gz
ampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.tar.bz2
ampache-d8ea07a04acc03160ac73f5db2a9249890e5fd13.zip
sync from 3.5.x and fix display issue on playlist view
Diffstat (limited to 'config')
-rw-r--r--config/ampache.cfg.php.dist4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 99fbe786..d215bf1d 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -78,9 +78,9 @@ session_cookiesecure = 0
; Auth Methods
; This defines which auth methods vauth will attempt
; to use and in which order, if auto_create isn't enabled
-; The user must exist locally as well
+; The user must exist locally. Local method uses PHP's PAM Auth module
; DEFAULT: mysql
-; VALUES: mysql,ldap,http
+; VALUES: mysql,ldap,http, local
auth_methods = "mysql"
;#####################