Bug#490526: libpam-usb: [PATCH] for non configured users quiet service does not apply (it is called too late in the code).

[Alban Browaeys]

Package: libpam-usb
Version: 0.4.2-1.1
Severity: important
Tags: patch

 This really fix the gksu calls (otherwise one get a * No device
 configured for user "root".).

 I moved the parsing of the options before the check for the if a user
 is assigned to a device. Thus the quiet option apply also to the fact a
 user have no device configured.
 Hope it is safe though it fix my issue with gksu as root have no device
 configured and I don't want one to be defined for root.


 Best regards
 Alban


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-rc7-00025-gacaef06-dirty (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages libpam-usb depends on:
ii  libc6                      2.7-12        GNU C Library: Shared libraries
ii  libdbus-1-3                1.2.1-2       simple interprocess messaging syst
ii  libhal-storage1            0.5.11-2      Hardware Abstraction Layer - share
ii  libhal1                    0.5.11-2      Hardware Abstraction Layer - share
ii  libxml2                    2.6.32.dfsg-2 GNOME XML library
ii  pmount                     0.9.17-2      mount removable devices as normal 

libpam-usb recommends no packages.

-- no debconf information

--- src/conf.c.orig     2008-07-12 13:44:15.000000000 +0200
+++ src/conf.c  2008-07-12 13:44:19.000000000 +0200
@@ -175,15 +175,15 @@
                        device_xpath,
                        opts->device.name,
                        sizeof(opts->device.name));
-       if (!retval || !pusb_conf_parse_device(opts, doc))
+       if (!pusb_conf_parse_options(opts, doc, user, service))
        {
-               log_error("No device configured for user \"%s\".\n", user);
                xmlFreeDoc(doc);
                xmlCleanupParser();
                return (0);
        }
-       if (!pusb_conf_parse_options(opts, doc, user, service))
+       if (!retval || !pusb_conf_parse_device(opts, doc))
        {
+               log_error("No device configured for user \"%s\".\n", user);
                xmlFreeDoc(doc);
                xmlCleanupParser();
                return (0);