Blame ecryptfs-utils-74-group.patch

Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1
Michal Hlavinka a225d8
--- ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group	2009-03-05 22:17:36.000000000 +0100
Michal Hlavinka a225d8
+++ ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1	2009-05-04 13:14:54.861539319 +0200
Michal Hlavinka a225d8
@@ -6,7 +6,7 @@ ecryptfs-mount-private \- interactive eC
Michal Hlavinka a225d8
 \fBecryptfs-mount-private\fP
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 .SH DESCRIPTION
Michal Hlavinka a225d8
-\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary.
Michal Hlavinka a225d8
+\fBecryptfs-mount-private\fP is a wrapper script for the \fBmount.ecryptfs_private\fP utility that will interactively prompt for the user's login password, if necessary. You need to be a member of \fBecryptfs\fB group to use this.
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 .SH FILES
Michal Hlavinka a225d8
 \fI~/.Private\fP - underlying directory containing encrypted data
Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1
Michal Hlavinka a225d8
--- ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group	2009-03-18 22:59:07.000000000 +0100
Michal Hlavinka a225d8
+++ ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1	2009-05-04 13:14:54.861539319 +0200
Michal Hlavinka a225d8
@@ -43,7 +43,7 @@ Setup this user such that the encrypted 
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 .SH DESCRIPTION
Michal Hlavinka a225d8
-\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user.
Michal Hlavinka a225d8
+\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user, who is a member of \fBecryptfs\fP group.
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 Be sure to properly escape your parameters according to your shell's special character nuances, and also surround the parameters by double quotes, if necessary. Any of the parameters may be:
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8
Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1
Michal Hlavinka a225d8
--- ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group	2009-03-05 22:17:36.000000000 +0100
Michal Hlavinka a225d8
+++ ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1	2009-05-04 13:20:07.673112485 +0200
Michal Hlavinka a225d8
@@ -8,7 +8,7 @@ mount.ecryptfs_private \- eCryptfs priva
Michal Hlavinka a225d8
 \fBNOTE:\fP This program will \fBnot\fP dynamically load the relevant keys.  For this reason, it is recommended that users use \fBecryptfs-mount-private\fP(1) instead!
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 .SH DESCRIPTION
Michal Hlavinka a225d8
-\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users to cryptographically mount a private directory, ~/Private.
Michal Hlavinka a225d8
+\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users, who are members of \fBecryptfs\fP group, to cryptographically mount a private directory, ~/Private.
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 If, and only if:
Michal Hlavinka a225d8
   - the private mount passphrase is in their kernel keyring, and
Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1
Michal Hlavinka a225d8
--- ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group	2009-03-05 22:17:36.000000000 +0100
Michal Hlavinka a225d8
+++ ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1	2009-05-04 13:14:54.862538533 +0200
Michal Hlavinka a225d8
@@ -14,7 +14,7 @@ Options available for the \fBumount.ecry
Michal Hlavinka a225d8
 Force the unmount, ignoring the value of the mount counter in \fI/tmp/ecryptfs-USERNAME-Private\fP
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 .SH DESCRIPTION
Michal Hlavinka a225d8
-\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users to unmount a cryptographically mounted private directory, ~/Private.
Michal Hlavinka a225d8
+\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users, who ares members of \fBecryptfs\fP group, to unmount a cryptographically mounted private directory, ~/Private.
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
 If, and only if:
Michal Hlavinka a225d8
   - the private mount passphrase is in their kernel keyring, and
Michal Hlavinka a225d8
diff -up ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group ecryptfs-utils-74/src/utils/ecryptfs-setup-private
Michal Hlavinka a225d8
--- ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group	2009-03-24 20:32:52.000000000 +0100
Michal Hlavinka a225d8
+++ ecryptfs-utils-74/src/utils/ecryptfs-setup-private	2009-05-04 13:14:54.862538533 +0200
Michal Hlavinka a225d8
@@ -188,6 +188,11 @@ else
Michal Hlavinka a225d8
 	id "$USER" >/dev/null || error "User [$USER] does not exist"
Michal Hlavinka a225d8
 fi
Michal Hlavinka a225d8
 
Michal Hlavinka a225d8
+# Check if user is member of ecryptfs group
Michal Hlavinka a225d8
+if ! groups "$USER" | sed  -e 's| |\n|g' | grep -n 'ecryptfs$'; then
Michal Hlavinka a225d8
+       error "User needs to be a member of ecryptfs group"
Michal Hlavinka a225d8
+fi
Michal Hlavinka a225d8
+
Michal Hlavinka a225d8
 # Obtain the user's home directory
Michal Hlavinka a225d8
 HOME=`getent passwd "$USER" | awk -F: '{print $6}'`
Michal Hlavinka a225d8
 if [ ! -d "$HOME" ]; then