- rel. down to 1, rm outdated comment

[packages/phpMyAdmin.git] / phpMyAdmin-config.patch

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index edb6d0e0376af9287f794166fdac82267b58c8fa..f21e488350905b83d69fa21db3bb14a39fd75c94 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,11 +1,24 @@
---- phpMyAdmin-2.4.0/config.inc.php~   Sun Feb 23 21:05:16 2003
-+++ phpMyAdmin-2.4.0/config.inc.php    Wed Apr 16 12:07:48 2003
-@@ -70,7 +70,7 @@
-                                                     // (this user must have read-only
- $cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
-                                                     // and "mysql/db" tables)
+diff -ur phpMyAdmin.orig/libraries/config.default.php phpMyAdmin/libraries/config.default.php
+--- phpMyAdmin.orig/libraries/config.default.php       2005-11-23 11:34:32.000000000 +0100
++++ phpMyAdmin/libraries/config.default.php    2005-12-19 21:02:34.565280520 +0100
+@@ -1,8 +1,6 @@
+ <?php
+ 
+-/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+-
+-/* $Id$ */
++/* $Id$ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -68,8 +66,8 @@
+                                                     // The controluser is also
+                                                     // used for all relational
+                                                     // features (pmadb)
 -$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
+-$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
++$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
++$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
  $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                      // with 'config' auth_type)
+ $cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only