Merge lp:~mhlavink/ecryptfs/mydev2 into lp:~ecryptfs/ecryptfs/ecryptfs-utils

[Michal Hlavinka]

[Michal Hlavinka (mhlavink)]

some fixes

[Dustin Kirkland  (kirkland)]

Thanks!

review: Approve

=== modified file 'src/desktop/ecryptfs-mount-private.desktop'
--- src/desktop/ecryptfs-mount-private.desktop	2009-02-03 08:50:36 +0000
+++ src/desktop/ecryptfs-mount-private.desktop	2009-03-20 10:13:44 +0000
@@ -4,4 +4,4 @@
 Exec=/usr/bin/ecryptfs-mount-private
 Terminal=true
 Type=Application
-Categories=System;
+Categories=System;Security;

=== modified file 'src/desktop/ecryptfs-setup-private.desktop'
--- src/desktop/ecryptfs-setup-private.desktop	2009-02-03 08:50:36 +0000
+++ src/desktop/ecryptfs-setup-private.desktop	2009-03-20 10:13:44 +0000
@@ -4,4 +4,4 @@
 Exec=/usr/bin/ecryptfs-setup-private
 Terminal=true
 Type=Application
-Categories=System;Preferences;
+Categories=Settings;Security;

=== modified file 'src/utils/ecryptfs-setup-private'
--- src/utils/ecryptfs-setup-private	2009-03-18 22:00:04 +0000
+++ src/utils/ecryptfs-setup-private	2009-03-20 09:39:09 +0000
@@ -97,7 +97,8 @@
 }
 
 filename_encryption_available() {
-	version=$(cat /sys/fs/ecryptfs/version)
+	version=$(cat /sys/fs/ecryptfs/version 2>/dev/null)
+	[ -z "$version" ] && error "Can't get ecryptfs version, ecryptfs kernel module not loaded?"
 	[ $(($version & 0x100)) -eq 0 ] && return 1
 	return 0
 }

=== modified file 'src/utils/umount.ecryptfs.c'
--- src/utils/umount.ecryptfs.c	2009-02-18 23:33:03 +0000
+++ src/utils/umount.ecryptfs.c	2009-03-20 16:29:31 +0000
@@ -26,6 +26,14 @@
 #include <unistd.h>
 #include "ecryptfs.h"
 
+static void usage()
+{
+	fprintf(stderr, "\teCryptfs umount helper\n\tusage: "
+		"umount [ecryptfs mount point]\n"
+		);
+	exit(-EINVAL);
+}
+
  /**
  * Parses a string of mount options, searching for an option name, and returns
  * a pointer to the option value.  For example, if name was "ecryptfs_sig=",
@@ -148,6 +156,9 @@
 	char **new_argv;
 	int rc;
 
+	if (argc<2)
+		usage();
+
 	if (unlink_keys_from_keyring(argv[1]))
 		fprintf(stderr, "Could not unlink the key(s) from your keying. "
 			"Please use `keyctl unlink` if you wish to remove the "