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

diff --git a/handlers/mysql b/handlers/mysql
index 0ff9884..ae54aae 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -24,7 +24,7 @@ getconf configfile /etc/mysql/debian.cnf
 local usevserver=no
 local vroot
 if [ $vservers_are_available = yes ]; then
-   if [ ! -z "$vsname" ]; then
+   if [ -n "$vsname" ]; then
       # does it exist ?
       if ! vservers_exist "$vsname" ; then
          fatal "The vserver given in vsname ($vsname) does not exist."
@@ -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"