Fixed improper use of $vuserhome as reported as Debian bug #351083

diff --git a/ChangeLog b/ChangeLog
index d7edcbed835d7d2b7df1da4f36077cdf644ca636..99a7aefcf565b1ebd24f8c3da4792c27521e2268 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 version 0.9.4 -- unreleased
     handler changes
        mysql, pgsql, svn: fixed inversed vsname emptyness check
 version 0.9.4 -- unreleased
     handler changes
        mysql, pgsql, svn: fixed inversed vsname emptyness check

+       mysql:
+        . Fixed improper use of $vuserhome (Debian: #351083)

     lib changes
        vserver:
         . init_vservers: fixed Debian bug #351083 (improper readlink syntax)
     lib changes
        vserver:
         . init_vservers: fixed Debian bug #351083 (improper readlink syntax)

diff --git a/handlers/mysql b/handlers/mysql
index ebde4abf6e427dcdbd50c3a34026fa88257b193f..f89d8d724bccd00d6a401f0cd408cb740ab2f8c9 100644 (file)
--- 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"
        
        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
 
        debug "using $defaultsfile"
 fi