Blob Blame History Raw
diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1
--- ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1.group	2009-03-05 22:17:36.000000000 +0100
+++ ecryptfs-utils-74/doc/manpage/ecryptfs-mount-private.1	2009-05-04 13:14:54.861539319 +0200
@@ -6,7 +6,7 @@ ecryptfs-mount-private \- interactive eC
 \fBecryptfs-mount-private\fP
 
 .SH DESCRIPTION
-\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.
+\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.
 
 .SH FILES
 \fI~/.Private\fP - underlying directory containing encrypted data
diff -up ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1
--- ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1.group	2009-03-18 22:59:07.000000000 +0100
+++ ecryptfs-utils-74/doc/manpage/ecryptfs-setup-private.1	2009-05-04 13:14:54.861539319 +0200
@@ -43,7 +43,7 @@ Setup this user such that the encrypted 
 
 
 .SH DESCRIPTION
-\fBecryptfs-setup-private\fP is a program that sets up a private cryptographic mountpoint for a non-root user.
+\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.
 
 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:
 
diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs.8
diff -up ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1
--- ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1.group	2009-03-05 22:17:36.000000000 +0100
+++ ecryptfs-utils-74/doc/manpage/mount.ecryptfs_private.1	2009-05-04 13:20:07.673112485 +0200
@@ -8,7 +8,7 @@ mount.ecryptfs_private \- eCryptfs priva
 \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!
 
 .SH DESCRIPTION
-\fBmount.ecryptfs_private\fP is a mount helper utility for non-root users to cryptographically mount a private directory, ~/Private.
+\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.
 
 If, and only if:
   - the private mount passphrase is in their kernel keyring, and
diff -up ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1
--- ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1.group	2009-03-05 22:17:36.000000000 +0100
+++ ecryptfs-utils-74/doc/manpage/umount.ecryptfs_private.1	2009-05-04 13:14:54.862538533 +0200
@@ -14,7 +14,7 @@ Options available for the \fBumount.ecry
 Force the unmount, ignoring the value of the mount counter in \fI/tmp/ecryptfs-USERNAME-Private\fP
 
 .SH DESCRIPTION
-\fBumount.ecryptfs_private\fP is a mount helper utility for non-root users to unmount a cryptographically mounted private directory, ~/Private.
+\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.
 
 If, and only if:
   - the private mount passphrase is in their kernel keyring, and
diff -up ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group ecryptfs-utils-74/src/utils/ecryptfs-setup-private
--- ecryptfs-utils-74/src/utils/ecryptfs-setup-private.group	2009-03-24 20:32:52.000000000 +0100
+++ ecryptfs-utils-74/src/utils/ecryptfs-setup-private	2009-05-04 13:14:54.862538533 +0200
@@ -188,6 +188,11 @@ else
 	id "$USER" >/dev/null || error "User [$USER] does not exist"
 fi
 
+# Check if user is member of ecryptfs group
+if ! groups "$USER" | sed  -e 's| |\n|g' | grep -n 'ecryptfs$'; then
+       error "User needs to be a member of ecryptfs group"
+fi
+
 # Obtain the user's home directory
 HOME=`getent passwd "$USER" | awk -F: '{print $6}'`
 if [ ! -d "$HOME" ]; then