Index: /locker/sql/bin/get-password
===================================================================
--- /locker/sql/bin/get-password	(revision 1048)
+++ /locker/sql/bin/get-password	(revision 1049)
@@ -12,21 +12,21 @@
 	global $env_user;
 	$cnfFile = file_get_contents($path);
-	if (preg_match('/\[mysql\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+	if (preg_match('/\[mysql\][^\[]*host *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$host = $match[1];
-	} elseif (preg_match('/\[client\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+	} elseif (preg_match('/\[client\][^\[]*host *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$host = $match[1];
 	} else {
 		$host = 'sql.mit.edu';
 	}
-	if (preg_match('/\[mysql\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+	if (preg_match('/\[mysql\][^\[]*user *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$user = $match[1];
-	} elseif (preg_match('/\[client\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+	} elseif (preg_match('/\[client\][^\[]*user *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$user = $match[1];
 	} else {
 		$user = $env_user;
 	}
-	if (preg_match('/\[mysql\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+	if (preg_match('/\[mysql\][^\[]*password *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$password = $match[1];
-	} elseif (preg_match('/\[client\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+	} elseif (preg_match('/\[client\][^\[]*password *= *([^\r\n]*)/',$cnfFile,$match)) {
 		$password = $match[1];
 	} else {