[Pkg-dspam-misc] Bug#467437: libdspam7-drv-mysql: regression in fix for #448519: connect fails if different password defined in /root/.my.cnf

[Tilman Koschnick]

Package: libdspam7-drv-mysql
Version: 3.6.8-5etch1
Severity: normal
Tags: patch

Hi,

the fix for bug #448519 in /etc/cron.daily/libdspam7-drv-mysql
introduces a new problem: If there is another password defined in
/etc/.my.cnf, it takes precedence over the one in
/etc/dspam/dspam.d/mysql.conf. 

A fix for the problem is attached - the solution is to use
--defaults-file instead of --defaults-extra-file in the invocation of
mysql.

Cheers, Til


-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-6-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages libdspam7-drv-mysql depends on:
ii  dbconfig-common        1.8.29+etch1      common framework for packaging dat
ii  debconf [debconf-2.0]  1.5.11etch1       Debian configuration management sy
ii  libc6                  2.3.6.ds1-13etch5 GNU C Library: Shared libraries
ii  libdspam7              3.6.8-5etch1      DSPAM is a scalable and statistica
ii  libldap2               2.1.30-13.3       OpenLDAP libraries
ii  libmysqlclient15off    5.0.32-7etch5     mysql database client library
ii  mysql-client           5.0.32-7etch5     mysql database client (meta packag
ii  mysql-client-5.0 [mysq 5.0.32-7etch5     mysql database client binaries
ii  ucf                    2.0020            Update Configuration File: preserv
ii  zlib1g                 1:1.2.3-13        compression library - runtime

Versions of packages libdspam7-drv-mysql recommends:
ii  mysql-server               5.0.32-7etch5 mysql database server (meta packag
ii  mysql-server-5.0 [mysql-se 5.0.32-7etch5 mysql database server binaries

-- debconf information excluded
-------------- next part --------------
--- libdspam7-drv-mysql.orig	2008-02-25 13:29:09.000000000 +0100
+++ libdspam7-drv-mysql	2008-02-25 13:25:41.000000000 +0100
@@ -23,14 +23,14 @@
     # If host is empty or starting with a / assume it's localhost.
     if [ -z "$MYSQL_HOST" ] || \
        [ ` echo "${MYSQL_HOST}" | cut -c1 ` = "/" ]; then
-        /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD \
+        /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD \
 	               --user=$MYSQL_USER $MYSQL_DB < $PURGE
     else
         if echo "$MYSQL_HOST" | grep "^/" > /dev/null 2>&1 ; then
             # Assume it is a socket:
-            /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD --socket=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
+            /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --socket=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
         else
-            /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
+            /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
         fi
     fi