bug #1662976 Authentication fails when controluser/pass is set

2007-03-19 15:06:53 +00:00
parent d0f31e2091
commit 420a9d58e7
5 changed files with 28 additions and 4 deletions
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -78,7 +78,13 @@ function PMA_DBI_connect($user, $password, $is_controluser = FALSE) {
        $link = PMA_DBI_real_connect($cfg['Server']['host'] . $server_port . $server_socket, $user, '', empty($client_flags) ? NULL : $client_flags);
    }

-    if (empty($link)) {
+        debug_print_backtrace();
+        die;
+    if (empty($link) && ! $is_controluser) {
+        if ($is_controluser) {
+            define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true);
+            return false;
+        }
        PMA_auth_fails();
    } // end if