forked from pool/pam_mount
30 lines
963 B
Plaintext
30 lines
963 B
Plaintext
|
Index: pam_mount-1.27/doc/changelog.txt
|
||
|
|
===================================================================
|
||
|
|
--- pam_mount-1.27.orig/doc/changelog.txt
|
||
|
|
+++ pam_mount-1.27/doc/changelog.txt
|
||
|
|
@@ -4,7 +4,7 @@ For details, see the history as recorded
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- pam_mount: avoid crash in sudo by not calling setenv() with NULL
|
||
|
|
-
|
||
|
|
+- umount.crypt: do not remove entry from /etc/mtab twice
|
||
|
|
|
||
|
|
v1.27 (July 01 2009)
|
||
|
|
====================
|
||
|
|
Index: pam_mount-1.27/src/mtcrypt.c
|
||
|
|
===================================================================
|
||
|
|
--- pam_mount-1.27.orig/src/mtcrypt.c
|
||
|
|
+++ pam_mount-1.27/src/mtcrypt.c
|
||
|
|
@@ -563,9 +563,8 @@ static int mtcr_umount(struct umount_opt
|
||
|
|
|
||
|
|
umount_args[argk++] = "umount";
|
||
|
|
#ifdef __linux__
|
||
|
|
- umount_args[argk++] = "-i";
|
||
|
|
- if (opt->no_update)
|
||
|
|
- umount_args[argk++] = "-n";
|
||
|
|
+ /* Always pass in -n, as we manually edit /etc/mtab */
|
||
|
|
+ umount_args[argk++] = "-ni";
|
||
|
|
#endif
|
||
|
|
umount_args[argk++] = mountpoint;
|
||
|
|
umount_args[argk] = NULL;
|