[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.0-2-11-g9526dea

[Markus Frosch]

The following commit has been merged in the master branch:
commit 4b12ae9bcf563ec48e94fe75d6d81f39b9bd446f
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Jun 19 08:19:42 2012 +0200

    fixed root password update bug when /root/.my.cnf exists and contains credentials (Closes: #677844)

diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index b4e9c78..d742d07 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -128,7 +128,7 @@ setpassword() {
         
         export MYSQL_PWD="$dbc_dbpass"
         echo "UPDATE nsm_user SET user_password='""$pwhash_e""', user_salt = '""$salt_e""', user_modified = NOW() WHERE user_name = 'root';" \
-           | mysql -h "${dbc_dbhost:=localhost}" -u "$dbc_dbuser" "$dbc_dbname"
+           | mysql --defaults-file=/dev/null -B -h "${dbc_dbhost:=localhost}" -u "$dbc_dbuser" "$dbc_dbname"
         echo "root password updated in database!"
     elif [ "$dbc_dbtype" = "pgsql" ]; then
         # query the database to update

-- 
Debian packaging of icinga-web