X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=ae54aae7f2a2c0500b8999e03e043009e6eb7768;hb=80303fea5381d115ed7353e514bb5eec157f8826;hp=ebde4abf6e427dcdbd50c3a34026fa88257b193f;hpb=dbd7bc2b3787036994d1f85a14689c811cfb6a31;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql b/handlers/mysql
index ebde4ab..ae54aae 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -160,7 +160,7 @@ else
 	
 	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"
+	defaultsfile="--defaults-file=$userhome/.my.cnf"
 	debug "using $defaultsfile"
 fi
 
@@ -277,7 +277,7 @@ fi
 fi
 
 # clean up tmp config file
-if [ "$dbusername" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
 	## clean up tmp config file
 	debug "rm $mycnf"