- release 2 for AC (rel.1 for RA to security)

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 1e34741c229cd607a3f7931dd314c0d2da84434a..fb88fea468559d763f2d67bc7137169fbf592a83 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,11 +1,14 @@
---- 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 -uNr phpMyAdmin-2.5.6-rc1/config.inc.php phpMyAdmin-2.5.6-rc1.new/config.inc.php
+--- phpMyAdmin-2.5.6-rc1/config.inc.php        Fri Jan  2 20:31:58 2004
++++ phpMyAdmin-2.5.6-rc1.new/config.inc.php    Sat Feb  7 19:17:43 2004
+@@ -79,8 +79,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]['user']          = 'root';      // MySQL user
 +$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
++$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