nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1615313, doc refers to auth_type HTTP so enable it

Browse Source
This commit is contained in:
Marc Delisle
2006-12-15 17:47:38 +00:00
parent c921839015
commit 14ff3c4729
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2006-12-15 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html, libraries/common.lib.php, config.default.php:
bug #1615313, doc referred to HTTP so enable the code to accept
either HTTP or http as auth_type
2006-12-15 Michal Čihař <michal@cihar.com> 2006-12-15 Michal Čihař <michal@cihar.com>
* lang/czech: Updated. * lang/czech: Updated.

6
Documentation.html
View File

@@ -657,9 +657,9 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
&quot;stduser/stdpass&quot;.</dd> &quot;stduser/stdpass&quot;.</dd>
<dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string
<tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'cookie'|'config']</tt></dt> <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt>
<dd>Whether config or cookie or <dd>Whether config or cookie or
<abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication <abbr title="HyperText Transfer Protocol">HTTP</abbr> or signon authentication
should be used for this server. should be used for this server.
<ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>) <ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>)
is the plain old way: username and password are stored in is the plain old way: username and password are stored in
@@ -672,7 +672,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
ends. This can also allow you to log in in arbitrary server if ends. This can also allow you to log in in arbitrary server if
<tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled. <tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled.
</li> </li>
<li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions) <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions and can be written also as 'http')
(<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0 (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
allows you to log in as any valid MySQL user via HTTP-Auth.</li> allows you to log in as any valid MySQL user via HTTP-Auth.</li>
<li>'signon' authentication mode <li>'signon' authentication mode

2
libraries/common.lib.php
View File

@@ -3046,6 +3046,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// (for a quick check of path disclosure in auth/cookies:) // (for a quick check of path disclosure in auth/cookies:)
$coming_from_common = true; $coming_from_common = true;
// to allow HTTP or http
$cfg['Server']['auth_type'] = strtolower($cfg['Server']['auth_type']);
if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) { if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
header('Location: error.php' header('Location: error.php'
. '?lang=' . urlencode($available_languages[$lang][2]) . '?lang=' . urlencode($available_languages[$lang][2])

2
libraries/config.default.php
View File

@@ -69,7 +69,7 @@ $cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user
// The controluser is also // The controluser is also
// used for all relational // used for all relational
// features (pmadb) // features (pmadb)
$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http, signon or cookie based)? $cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (valid choices: config, http, HTTP, signon or cookie)
$cfg['Servers'][$i]['user'] = 'root'; // MySQL user $cfg['Servers'][$i]['user'] = 'root'; // MySQL user
$cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed $cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed
// with 'config' auth_type) // with 'config' auth_type)