Merge lp:~andersk/ecryptfs/lp1323421 into lp:ecryptfs

[Anders Kaseorg]

[Seth Arnold (seth-arnold)]

Looks good to me. Nice find.

[Tyler Hicks (tyhicks)]

Thanks for the fix, Anders!

review: Approve

=== modified file 'src/pam_ecryptfs/pam_ecryptfs.c'
--- src/pam_ecryptfs/pam_ecryptfs.c	2013-10-27 22:47:49 +0000
+++ src/pam_ecryptfs/pam_ecryptfs.c	2014-05-26 21:19:00 +0000
@@ -336,10 +336,10 @@
 			}
 			clearenv();
 			if (setgroups(1, &pwd->pw_gid) < 0 || setgid(pwd->pw_gid) < 0)
-				return -1;
+				exit(-1);
 			/* run mount.ecryptfs_private as the user */
 			if (setresuid(pwd->pw_uid, pwd->pw_uid, pwd->pw_uid) < 0)
-				return -1;
+				exit(-1);
 			execl("/sbin/mount.ecryptfs_private",
 			      "mount.ecryptfs_private", NULL);
 		} else {
@@ -350,10 +350,10 @@
 			}
 			clearenv();
 			if (setgroups(1, &pwd->pw_gid) < 0 || setgid(pwd->pw_gid) < 0)
-				return -1;
+				exit(-1);
 			/* run umount.ecryptfs_private as the user */
 			if (setresuid(pwd->pw_uid, pwd->pw_uid, pwd->pw_uid) < 0)
-				return -1;
+				exit(-1);
 			execl("/sbin/umount.ecryptfs_private",
  			      "umount.ecryptfs_private", NULL);
 			exit(1);