Changeset 1037 for locker

Timestamp:

Mar 31, 2009, 5:31:30 AM (16 years ago)

Author:

mitchb

Message:

Make get-password more accomodating in my.cnf formats it understands.
Allow the login info to appear in either the [mysql] or [client]
section, and allow spaces around the equal signs.

File:

• locker/sql/bin/get-password (modified) (1 diff)

locker/sql/bin/get-password

@@ -12 +12 @@
         global $env_user;
         $cnfFile = file_get_contents($path);
-        preg_match('/\[mysql\][^\[]*host=([^\n]*)/',$cnfFile,$match);
-        $host = $match[1];
-        preg_match('/\[mysql\][^\[]*user=([^\n]*)/',$cnfFile,$match);
-        $user = $match[1];
-        preg_match('/\[mysql\][^\[]*password=([^\n]*)/',$cnfFile,$match);
-        $password = $match[1];
-        if (empty($host)) $host = 'sql.mit.edu';
-        if (empty($user)) $user = $env_user;
-        if (empty($password)) $password = 'password';
+        if (preg_match('/\[mysql\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+                $host = $match[1];
+        } elseif (preg_match('/\[client\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+                $host = $match[1];
+        } else {
+                $host = 'sql.mit.edu';
+        }
+        if (preg_match('/\[mysql\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+                $user = $match[1];
+        } elseif (preg_match('/\[client\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+                $user = $match[1];
+        } else {
+                $user = $env_user;
+        }
+        if (preg_match('/\[mysql\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+                $password = $match[1];
+        } elseif (preg_match('/\[client\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+                $password = $match[1];
+        } else {
+                $password = 'password';
+        }
         return array($host,$user,$password);
 }