cleaned up the configuration file

ChangeLog

@@ -5,8 +5,14 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-10-23  Lo<4C>c Chapeaux  <lolo@phpheaven.net>
+	* config.inc.php3: removed unnecessary settings (stdpass is no long
+	  required and there is no need to use both stduser/user).
+	* Documentation.html: updated according to the changes in the configuration
+	  file.
+
 2001-10-22  Lo<4C>c Chapeaux  <lolo@phpheaven.net>
-	* Ducumentation.html, line 299: added some requirements for sockets.
+	* Documentation.html, line 299: added some requirements for sockets.
 	* main.php3: ensured sockets aren't displayed and used if php < 3.0.10.
 	* libraries/common.lib.php3: ensured the same rules apply whatever is the
 	  authentication mode and that the cfgServers[i]['only_db'] is really used.

Documentation.html

@@ -314,10 +314,10 @@
     <dd>
         Whether basic or advanced authentication should be used for this
         server.<br />
-        Basic authentication (<tt>$adv_auth&nbsp;=&nbsp;false</tt>) is the
+        Basic authentication (<tt>$adv_auth&nbsp;=&nbsp;FALSE</tt>) is the
         plain old way: username and password are stored in
         <i>config.inc.php3</i>.
-        Advanced authentication (<tt>$adv_auth&nbsp;=&nbsp;true</tt>) as
+        Advanced authentication (<tt>$adv_auth&nbsp;=&nbsp;TRUE</tt>) as
         introduced in 1.3.0 allows you to log in as any valid MySQL user via
         HTTP-Auth.<br />
         Please note that this authentication mode is
@@ -338,45 +338,24 @@
             </li>
         </ul>
 
-        Advanced authentication is secure as the standard user needs just
+        Advanced authentication is secure as the MySQL passwords does not need
-        read-only-access to the mysql database.
+        to be set in the phpMyAdmin configuration file.
-        <br /><br />
-
-        All you have to provide in config.inc is a standard user which can
-        connect to MySQL and read the mysql user/db table
-        (see <tt>$cfgServers[n]['stduser']</tt>).
-        <br /><br />
-
-        Please also note that if you try a phpMyAdmin login with this stduser,
-        you could get some errors, depending on the exact privileges you gave
-        to this stduser. phpMyAdmin does not support a direct login with the
-        the stduser.
         <br /><br />
 
         See also the FAQ section for more information about security.
         <br /><br />
     </dd>
 
-    <dt>
-        <b>$cfgServers[n]['stduser']</b> string<br />
-        <b>$cfgServers[n]['stdpass']</b> string
-    </dt>
-    <dd>
-        A user/password pair used to verify the real user/password pair when
-        using advanced authentication. This user must be able to connect to
-        MySQL and read the mysql user table.<br />
-        Not needed when using basic authentication.
-        <br /><br />
-    </dd>
-
     <dt>
         <b>$cfgServers[n]['user']</b> string<br />
         <b>$cfgServers[n]['password']</b> string
     </dt>
     <dd>
         The user/password-pair which phpMyAdmin will use to connect to this
-        MySQL-server when using basic authentication.<br />
+        MySQL-server.<br />
-        Not needed when using advanced authentication.
+        While <tt>$cfgServers[n]['user']</tt> is always required,
+        <tt>$cfgServers[n]['password']</tt> is not needed when using advanced
+        authentication (let it empty in this case).
         <br /><br />
     </dd>
 
@@ -431,7 +410,7 @@
             </li>
         </ul><br />
 
-        If you are using advanced authentication, stduser must have
+        If you are using advanced authentication, users must have
         <tt>Select_Priv, Insert_Priv</tt> and <tt>Delete_Priv</tt> set to "Y"
         in <i>mysql.db</i> table for the bookmark database.
         <br /><br />
@@ -779,8 +758,9 @@
 </p>
 <ul>
     <li>
-        <tt>$stduser/$stdpassword</tt> is wrong. Try to turn off $adv_auth and
+        <tt>$cfgServers[n]['user']</tt> is wrong. Try to turn off
-        use this username and password to connect to MySQL.
+        <tt>$cfgServers[n]['adv_auth']</tt> and use this username and password
+        to connect to MySQL.
     </li>
     <li>
         The username/password your specify in the login-dialog is wrong. Try

config.inc.php3

@@ -43,9 +43,7 @@ $cfgServers[1]['port']          = '';          // MySQL port - leave blank for d
 $cfgServers[1]['socket']        = '';          // Path to the socket - leave blank for default socket
 $cfgServers[1]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfgServers[1]['adv_auth']      = FALSE;       // Use advanced authentication?
-$cfgServers[1]['stduser']       = '';          // MySQL standard user (only needed with advanced auth)
+$cfgServers[1]['user']          = 'root';      // MySQL user (always required)
-$cfgServers[1]['stdpass']       = '';          // MySQL standard password (only needed with advanced auth)
-$cfgServers[1]['user']          = 'root';      // MySQL user (only needed with basic auth)
 $cfgServers[1]['password']      = '';          // MySQL password (only needed with basic auth)
 $cfgServers[1]['only_db']       = '';          // If set to a db-name, only this db is displayed at left frame
                                                // It may also be an array of db-names
@@ -58,8 +56,6 @@ $cfgServers[2]['port']          = '';
 $cfgServers[2]['socket']        = '';
 $cfgServers[2]['connect_type']  = 'tcp';
 $cfgServers[2]['adv_auth']      = FALSE;
-$cfgServers[2]['stduser']       = '';
-$cfgServers[2]['stdpass']       = '';
 $cfgServers[2]['user']          = 'root';
 $cfgServers[2]['password']      = '';
 $cfgServers[2]['only_db']       = '';
@@ -72,8 +68,6 @@ $cfgServers[3]['port']          = '';
 $cfgServers[3]['socket']        = '';
 $cfgServers[3]['connect_type']  = 'tcp';
 $cfgServers[3]['adv_auth']      = FALSE;
-$cfgServers[3]['stduser']       = '';
-$cfgServers[3]['stdpass']       = '';
 $cfgServers[3]['user']          = 'root';
 $cfgServers[3]['password']      = '';
 $cfgServers[3]['only_db']       = '';