From d4490f3d011c2c283723ff4f028239e0c64e70b29d30dc820c556924adfcd66e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 2 Jun 2010 00:04:05 +0000 Subject: [PATCH] Accepting request 40947 from Linux-PAM Copy from Linux-PAM/pam_mount based on submit request 40947 from user mcalmer OBS-URL: https://build.opensuse.org/request/show/40947 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=37 --- mount.crypt | 8 ++++---- mount.encfs13 | 8 ++++---- pam_mount.changes | 5 +++++ pam_mount.spec | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mount.crypt b/mount.crypt index f59e971..00ca6dd 100644 --- a/mount.crypt +++ b/mount.crypt @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.crypt ]; then + if [ ! -x /usr/sbin/umount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found." exit 1 fi - ../usr/sbin/umount.crypt $@ + /usr/sbin/umount.crypt "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.crypt ]; then + if [ ! -x /usr/sbin/mount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found." exit 1 fi - ../usr/sbin/mount.crypt $@ + /usr/sbin/mount.crypt "$@" else logger -t "mount.crypt" -p user.err -i "Unknown command: $0" exit 1 diff --git a/mount.encfs13 b/mount.encfs13 index 740e44b..d18a340 100644 --- a/mount.encfs13 +++ b/mount.encfs13 @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.encfs13 ]; then + if [ ! -x /usr/sbin/umount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found." exit 1 fi - ../usr/sbin/umount.encfs13 $@ + /usr/sbin/umount.encfs13 "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.encfs13 ]; then + if [ ! -x /usr/sbin/mount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found." exit 1 fi - ../usr/sbin/mount.encfs13 $@ + /usr/sbin/mount.encfs13 "$@" else logger -t "mount.encfs13" -p user.err -i "Unknown command: $0" exit 1 diff --git a/pam_mount.changes b/pam_mount.changes index 5156e01..7f40710 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de + +- use full paths in wrapper scripts (bnc#607200) + ------------------------------------------------------------------- Wed Apr 7 23:43:17 UTC 2010 - jengelh@medozas.de diff --git a/pam_mount.spec b/pam_mount.spec index 92e8dbb..42542d5 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -26,7 +26,7 @@ BuildRequires: libHX-devel >= 3.4 BuildRequires: linux-kernel-headers >= 2.6 Summary: A PAM Module that can Mount Volumes for a User Session Version: 1.34 -Release: 1 +Release: 2 Recommends: cryptsetup Recommends: cifs-mount Requires: util-linux