[patch] Patch to fix sys-auth/pam_mount-2.0 handling of mount options with the "regular mount program".

pam_mount-2.0-mount-options.patch (text/plain), 1.12 KB, created by Gef on 2010-05-04 18:45:03 UTC

diff -ur work.orig//pam_mount-2.0/src/rdconf1.c work//pam_mount-2.0/src/rdconf1.c
--- work.orig//pam_mount-2.0/src/rdconf1.c	2010-04-20 23:22:08.000000000 +0200
+++ work//pam_mount-2.0/src/rdconf1.c	2010-05-04 20:28:22.079531500 +0200
@@ -1353,7 +1353,7 @@
 	/* Do not use LCLMOUNT to avoid calling fsck */
 	{CMD_NFSMOUNT,    "nfs",   {"mount", "%(if %(OPTIONS),-o%(OPTIONS)", "-t%(FSTYPE)", "%(SERVER):%(VOLUME)", "%(MNTPT)", NULL}},
 	{CMD_NFSMOUNT,    "nfs4"},
-	{CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS)", "%(OPTIONS)", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
+	{CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
 	{CMD_CRYPTMOUNT,  "crypt", {"mount.crypt", "%(if %(CIPHER),-ocipher=%(CIPHER)", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER)", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH)", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH)", "%(if %(OPTIONS),-o%(OPTIONS)", "%(VOLUME)", "%(MNTPT)", NULL}},
 	{CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}},
 	{CMD_UMOUNT,     NULL,     {"umount", "%(MNTPT)", NULL}},