X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=d3179309412bde11ca83bd85dd12165ac0c1bbed;hb=55b02f8536feaebbebc598cfb8a3f1abc08ced1c;hp=20905d56232010748dabff102602b25e273e3db0;hpb=065c9aa959922aaad5d9453335cd3fc5c3495bcd;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 20905d5..d317930 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # mysql handler script for backupninja
 #
@@ -47,32 +48,6 @@ then
 	fi
 fi
 
-if [ "$user" == "" ]; then
-	userset=false;
-	user=root;
-else
-	userset=true;
-	if [ $usevserver ]
-	then
-	    userhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'`
-	    if [ $? -eq 2 ]
-	    then
-	    	fatal "User $user not found in /etc/passwd"
-	    fi
-    	    userhome="$vroot$userhome"
-	    debug "User home set to: $userhome"
-	    [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-	else
-	    userhome=`getent passwd "$user" | awk -F: '{print $6}'`
-	    if [ $? -eq 2 ]
-	    then
-	    	fatal "User $user not found in /etc/passwd"
-	    fi
-       	    debug "User home set to: $userhome"
-    	    [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-	fi
-fi
-
 ## Prepare ignore part of the command
 ## This only works for mysqldump at the moment
 
@@ -164,10 +139,34 @@ EOF
 	else
 	    defaultsfile="--defaults-file=$mycnf"
 	fi
+fi
+
+# if a user is not set, use $confgfile, otherwise use $mycnf
+if [ "$user" == "" ]; then
+	user=root;
+	defaultsfile="--defaults-file=$configfile"
+else
+	userset=true;
+	if [ $usevserver ]
+	then
+	    vuserhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'`
+	    if [ $? -eq 2 ]
+	    then
+	    	fatal "User $user not found in /etc/passwd"
+	    fi
+    	    userhome="$vroot$vuserhome"
+	else
+	    userhome=`getent passwd "$user" | awk -F: '{print $6}'`
+	    if [ $? -eq 2 ]
+	    then
+	    	fatal "User $user not found in /etc/passwd"
+	    fi
+       	fi
 	
-# if user is set, don't use $mycnf	
-elif [ "$userset" == "false" ]; then
-		defaultsfile="--defaults-file=$configfile"
+	debug "User home set to: $userhome"
+	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
+	defaultsfile="--defaults-file=$vuserhome/.my.cnf"
+	debug "using $defaultsfile"
 fi
 
 #######################################################################
@@ -236,16 +235,17 @@ then
     then
 	if [ $usevserver ]
 	then
+	    debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
 	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 	    if [ $? -ne 0 ]
 	    then
-	        fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
+	        fatal "Authentication problem, maybe user/password is wrong"
 	    fi
 	else
 		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		if [ $? -ne 0 ]
 		then
-		    fatal "Something unexpected happened, the defaults file may have gone missing or is corrupt"
+		    fatal "Authentication problem, maybe user/password is wrong"
 		fi
 	fi
 fi