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

[Michal Hlavinka]

[lp:~mhlavink/ecryptfs/rhbugs1]

387. By Michal Hlavinka on 2009-04-22

check and fix asprintf's error codes

Change all MOUNT_ERROR return codes for asprintf failure to -ENOMEM.
Make sure all return codes are reset to zero or overwritten,
because asprintf doesn't return zero for success.

Signed-off-by: Michal Hlavinka <email address hidden>

388. By Michal Hlavinka on 2009-04-22

key_management.c: if key is already in keyring don't report it as error

ecryptfs_add_passphrase_key_to_keyring gets return code 1 if key,
it is trying to add to keyring, already exists in keyring.
Return code remains 1, just don't report it as error.

Signed-off-by: Michal Hlavinka <email address hidden>

[Tyler Hicks (tyhicks)]

review: Approve

[Dustin Kirkland  (kirkland)]

review: Approve

=== modified file 'doc/manpage/ecryptfs.7'
--- doc/manpage/ecryptfs.7	2009-03-24 20:06:33 +0000
+++ doc/manpage/ecryptfs.7	2009-04-21 17:37:16 +0000
@@ -54,6 +54,9 @@
 .B ecryptfs_enable_filename_crypto=(y/N)
 Specify whether filename encryption should be enabled. If not, the mount helper will not prompt the user for the filename encryption key signature.
 .TP
+.B verbosity=0/1
+Specify if the mount helper can ask you for missing values (default) or If should not ask and fail (for verbosity=0).
+.TP
 
 KEY MODULE OPTIONS
 

=== modified file 'src/include/decision_graph.h'
--- src/include/decision_graph.h	2009-02-03 08:50:36 +0000
+++ src/include/decision_graph.h	2009-04-21 19:23:03 +0000
@@ -75,9 +75,10 @@
 };
 
 struct param_node {
-#define MOUNT_ERROR -3
-#define NULL_TOK -1
-#define DEFAULT_TOK -2
+#define MOUNT_ERROR 3
+#define NULL_TOK 1
+#define DEFAULT_TOK 2
+#define WRONG_VALUE 4
         int num_mnt_opt_names;
 #define MAX_NUM_MNT_OPT_NAMES 8
         char *mnt_opt_names[MAX_NUM_MNT_OPT_NAMES];
@@ -102,6 +103,7 @@
 #define ECRYPTFS_DISPLAY_PRETTY_VALS       0x00000400
 #define ECRYPTFS_NO_AUTO_TRANSITION        0x00000800
 #define ECRYPTFS_IMPLICIT_OVERRIDE_DEFAULT 0x00001000
+#define ECRYPTFS_NONEMPTY_VALUE_REQUIRED   0x00002000
         uint32_t flags;
         int num_transitions;
 #define MAX_NUM_TRANSITIONS 64

=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
--- src/key_mod/ecryptfs_key_mod_openssl.c	2009-02-17 15:16:28 +0000
+++ src/key_mod/ecryptfs_key_mod_openssl.c	2009-04-21 19:50:44 +0000
@@ -294,7 +294,7 @@
 		syslog(LOG_ERR,
 		       "%s: Unable to read private key from file [%s]\n",
 		       __FUNCTION__, openssl_data->path);
-		rc = -EIO;
+		rc = -ENOKEY;
 		goto out;
 	}
 	rc = 0;
@@ -487,10 +487,11 @@
 	subgraph_ctx = (struct ecryptfs_subgraph_ctx *)(*foo);
 	if ((rc = asprintf(&subgraph_ctx->openssl_data.path, "%s", node->val))
 	    == -1) {
-		rc = MOUNT_ERROR;
+		rc = -ENOMEM;
 		goto out;
 	}
 	rc = DEFAULT_TOK;
+	free(node->val);
 	node->val = NULL;
 out:
 	return rc;
@@ -518,7 +519,7 @@
 	}
 	if ((subgraph_ctx->key_mod->blob = malloc(blob_size)) == NULL) {
 		syslog(LOG_ERR, "Out of memory\n");
-		rc = MOUNT_ERROR;
+		rc = -ENOMEM;
 		goto out;
 	}
 	if ((rc = ecryptfs_openssl_serialize((unsigned char *) 
@@ -538,15 +539,13 @@
 		syslog(LOG_ERR, "Error attempting to add key to keyring for "
 		       "key module [%s]; rc = [%d]\n",
 		       subgraph_ctx->key_mod->alias, rc);
-		rc = MOUNT_ERROR;
 		goto out;
 	}
 	if ((rc = asprintf(&sig_mnt_opt, "ecryptfs_sig=%s", sig)) == -1) {
-		rc = MOUNT_ERROR;
+		rc = -ENOMEM;
 		goto out;
 	}
-	rc = 0;
-	stack_push(mnt_params, sig_mnt_opt);
+	rc = stack_push(mnt_params, sig_mnt_opt);
 out:
 	return rc;
 }
@@ -609,20 +608,20 @@
 		rc = MOUNT_ERROR;
 		goto out;
 	}
-	if ((rc = parse_options_file(fd, &file_head))) {
+	rc = parse_options_file(fd, &file_head);
+	close(fd);
+	if (rc) {
 		syslog(LOG_ERR, "%s: Error attempting to parse options out "
 		       "of file\n", __FUNCTION__);
-		rc = MOUNT_ERROR;
 		goto out;
 	}
-	close(fd);
 	walker = file_head.next;
 	while (walker) {
 		if (strcmp(walker->name, "openssl_passwd") == 0) {
 			if ((rc = 
 			     asprintf(&subgraph_ctx->openssl_data.passphrase,
 				      "%s", walker->value)) == -1) {
-				rc = MOUNT_ERROR;
+				rc = -ENOMEM;
 				goto out;
 			}
 			break;
@@ -635,7 +634,6 @@
 		rc = MOUNT_ERROR;
 		goto out;
 	}
-// #warning MEMORY LEAK: something is wrong with freeing file_head
 	walker = NULL;
 	if ((rc = ecryptfs_openssl_process_key(subgraph_ctx, mnt_params))) {
 		syslog(LOG_ERR, "Error processing OpenSSL key; rc = [%d]", rc);
@@ -658,7 +656,7 @@
 static int tf_ssl_passwd_fd(struct ecryptfs_ctx *ctx, struct param_node *node,
 			    struct val_node **mnt_params, void **foo)
 {
-	return 0;
+	return ENOSYS;
 }
 
 static int tf_ecryptfs_openssl_gen_key_param_node_keyfile(
@@ -826,7 +824,8 @@
 	 .val = NULL,
 	 .display_opts = NULL,
 	 .default_val = NULL,
-	 .flags = STDIN_REQUIRED | ECRYPTFS_PARAM_FLAG_ECHO_INPUT,
+	 .flags = STDIN_REQUIRED | ECRYPTFS_PARAM_FLAG_ECHO_INPUT
+		  | ECRYPTFS_NONEMPTY_VALUE_REQUIRED,
 	 .num_transitions = 1,
 	 .tl = {{.val = NULL,
 		 .pretty_val = NULL,
@@ -840,7 +839,8 @@
 	 .val = NULL,
 	 .display_opts = NULL,
 	 .default_val = NULL,
-	 .flags = STDIN_REQUIRED | ECRYPTFS_PARAM_FLAG_ECHO_INPUT,
+	 .flags = STDIN_REQUIRED | ECRYPTFS_PARAM_FLAG_ECHO_INPUT
+		  | ECRYPTFS_NONEMPTY_VALUE_REQUIRED,
 	 .num_transitions = 1,
 	 .tl = {{.val = NULL,
 		 .pretty_val = NULL,

=== modified file 'src/key_mod/ecryptfs_key_mod_passphrase.c'
--- src/key_mod/ecryptfs_key_mod_passphrase.c	2009-02-17 15:16:28 +0000
+++ src/key_mod/ecryptfs_key_mod_passphrase.c	2009-04-21 19:50:44 +0000
@@ -35,9 +35,9 @@
 {
 	int rc;
 	if (!node->val)
-		return EINVAL;
+		return -EINVAL;
 	if ((rc = stack_push(head, node->val)))
-		return -rc;
+		return rc;
 	node->val = NULL;
 	return DEFAULT_TOK;
 }
@@ -53,16 +53,16 @@
 
 	file_head = malloc(sizeof(struct ecryptfs_name_val_pair));
 	if (!file_head) {
-		rc = ENOMEM;
+		rc = -ENOMEM;
 		goto out;
 	}
 	memset(file_head, 0, sizeof(struct ecryptfs_name_val_pair));
 	if (strcmp(node->mnt_opt_names[0], "passphrase_passwd_file") == 0) {
 		fd = open(node->val, O_RDONLY);
 		if (fd == -1) {
+			rc = -errno;
 			syslog(LOG_ERR, "%s: Error whilst attempting to open "
 			       "[%s]; errno = [%m]\n", __FUNCTION__, node->val);
-			rc = MOUNT_ERROR;
 			goto out;
 		}
 	} else if (strcmp(node->mnt_opt_names[0], "passphrase_passwd_fd") == 0) {
@@ -74,19 +74,18 @@
 		goto out;
 	}
 	rc = parse_options_file(fd, file_head);
+	close(fd);
 	if (rc) {
 		syslog(LOG_ERR, "%s: Error parsing file for passwd; "
 		       "rc = [%d]\n", __FUNCTION__, rc);
-		rc = MOUNT_ERROR;
 		goto out;
 	}
-	close(fd);
 	walker = file_head->next;
 	while (walker) {
 		if (strcmp(walker->name, "passphrase_passwd") == 0
 		    || strcmp(walker->name, "passwd") == 0) {
 			if (asprintf(&tmp_val, "%s", walker->value) < 0) {
-				rc = ENOMEM;
+				rc = -ENOMEM;
 				goto out;
 			}
 			stack_push(head, tmp_val);
@@ -122,27 +121,26 @@
 	if (!node->val)
 		rc = asprintf(&node->val, "%s", node->default_val);
 	if (rc == -1)
-		return MOUNT_ERROR;
+		return -ENOMEM;
 	stack_push(head, node->val);
 	node->val = NULL;
 	stack_pop_val(head, (void *)&salt_hex);
 	stack_pop_val(head, (void *)&passwd);
 	auth_tok_sig = malloc(ECRYPTFS_SIG_SIZE_HEX + 1);
 	if (!auth_tok_sig) {
-		rc = ENOMEM;
+		rc = -ENOMEM;
 		goto out;
 	}
 	from_hex(salt, salt_hex, ECRYPTFS_SIG_SIZE);
 	rc = ecryptfs_add_passphrase_key_to_keyring(auth_tok_sig, passwd, salt);
 	if (rc < 0) {
 		free(auth_tok_sig);
-		rc = -rc;
 		goto out;
 	}
 	rc = asprintf(&param, "ecryptfs_sig=%s", auth_tok_sig);
 	if (rc == -1) {
 		free(auth_tok_sig);
-		rc = ENOMEM;
+		rc = -ENOMEM;
 		goto out;
 	}
 	free(auth_tok_sig);
@@ -195,7 +193,8 @@
 	 .val = NULL,
 	 .display_opts = NULL,
 	 .default_val = NULL,
-	 .flags = ECRYPTFS_PARAM_FLAG_MASK_OUTPUT,
+	 .flags = (ECRYPTFS_PARAM_FLAG_MASK_OUTPUT
+		   | ECRYPTFS_NONEMPTY_VALUE_REQUIRED),
 	 .num_transitions = 2,
 	 .tl = {{.val = "passphrase_salt",
 		 .pretty_val = "salt",
@@ -214,7 +213,8 @@
 	 .val = NULL,
 	 .display_opts = NULL,
 	 .default_val = NULL,
-	 .flags = ECRYPTFS_PARAM_FLAG_MASK_OUTPUT,
+	 .flags = ECRYPTFS_PARAM_FLAG_ECHO_INPUT
+		  | ECRYPTFS_NONEMPTY_VALUE_REQUIRED,
 	 .num_transitions = 2,
 	 .tl = {{.val = "passphrase_salt",
 		 .pretty_val = "salt",
@@ -233,7 +233,8 @@
 	 .val = NULL,
 	 .display_opts = NULL,
 	 .default_val = NULL,
-	 .flags = ECRYPTFS_PARAM_FLAG_MASK_OUTPUT,
+	 .flags = ECRYPTFS_PARAM_FLAG_ECHO_INPUT
+		  | ECRYPTFS_NONEMPTY_VALUE_REQUIRED,
 	 .num_transitions = 2,
 	 .tl = {{.val = "salt",
 		 .pretty_val = "salt",
@@ -282,7 +283,7 @@
 
 	if (asprintf(alias, "passphrase") == -1) {
 		syslog(LOG_ERR, "Out of memory\n");
-		rc = ENOMEM;
+		rc = -ENOMEM;
 		goto out;
 	}
 out:

=== modified file 'src/libecryptfs/cmd_ln_parser.c'
--- src/libecryptfs/cmd_ln_parser.c	2009-02-17 15:16:28 +0000
+++ src/libecryptfs/cmd_ln_parser.c	2009-04-21 19:50:44 +0000
@@ -382,11 +382,15 @@
 		       __FUNCTION__, rc, fd);
 		goto out;
 	}
+	if (S_ISDIR(filestat.st_mode)) {
+		rc = -EISDIR;
+		goto out;
+	}
 	pagesize = getpagesize();
 	file_size = filestat.st_size;
 	if (file_size > MAX_FILE_SIZE) {
 		syslog(LOG_ERR, "File size too large\n");
-		rc = -1;
+		rc = -EFBIG;
 		goto out;
 	}
 	if (file_size % pagesize) {
@@ -395,7 +399,7 @@
 	}
 	data = mmap((caddr_t)0, file_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (data == MAP_FAILED)	{
-		rc = errno;
+		rc = -errno;
 		syslog(LOG_ERR, "%s: mmap failed on fd [%d]; rc = [%d]\n",
 		       __FUNCTION__, fd, rc);
 		goto out;

=== modified file 'src/libecryptfs/decision_graph.c'
--- src/libecryptfs/decision_graph.c	2009-02-17 15:16:28 +0000
+++ src/libecryptfs/decision_graph.c	2009-04-21 19:50:44 +0000
@@ -255,12 +255,12 @@
 				if ((*next = tn->next_token))
 					return 0;
 				else
-					return EINVAL;
+					return -EINVAL;
 			} else if (trans_func_tok_id == NULL_TOK) {
 				if ((*next = tn->next_token))
 					return 0;
 				else
-					return EINVAL;
+					return -EINVAL;
 			}
 			nvp = nvp->next;
 		}
@@ -275,12 +275,18 @@
 				trans_func_tok_id =
 					tn->trans_func(ctx, current,
 						       mnt_params, foo);
+			if (trans_func_tok_id == WRONG_VALUE && 
+			    (ctx->verbosity || 
+			     (current->flags & STDIN_REQUIRED))) {
+			    *next = current;
+			    return 0;
+			}
 			if (trans_func_tok_id == MOUNT_ERROR || 
-			    trans_func_tok_id > 0)
+			    trans_func_tok_id < 0)
 				return trans_func_tok_id;
 			if ((*next = tn->next_token))
 				return 0;
-			else return EINVAL;
+			else return -EINVAL;
 		}
 	}
 	return NULL_TOK;
@@ -367,6 +373,7 @@
 	int value_retrieved;
 	int i;
 	int rc;
+	int tries = 0;
 
 	if (ecryptfs_verbosity)
 		syslog(LOG_INFO, "%s: Called on node->mnt_opt_names[0] = [%s]",
@@ -599,6 +606,7 @@
 				syslog(LOG_INFO, "%s: DISPLAY_TRANSITION_NODE_"
 				       "VALS not set\n", __FUNCTION__);
 obtain_value:
+			if (++tries > 3) return EINVAL;
 			if (node->suggested_val)
 				rc = asprintf(&prompt, "%s [%s]", node->prompt,
 					 node->suggested_val);
@@ -619,6 +627,12 @@
 				(&(node->val), prompt,
 				 (node->flags
 				  & ECRYPTFS_PARAM_FLAG_ECHO_INPUT));
+			if (node->val[0] == '\0' && 
+			    (node->flags & ECRYPTFS_NONEMPTY_VALUE_REQUIRED)) {
+				fprintf(stderr,"Wrong input, non-empty value "
+					"required!\n");
+				goto obtain_value;
+			}
 			free(prompt);
 			if (node->flags & VERIFY_VALUE) {
 				rc = asprintf(&verify_prompt, "Verify %s",
@@ -702,9 +716,7 @@
 
 	memset(*mnt_params, 0, sizeof(struct val_node));
 	rc = eval_param_tree(ctx, root_node, nvp_head, mnt_params);
-	if (rc > 0)
-		return -rc;
-	if (rc != MOUNT_ERROR)
+	if ((rc > 0) && (rc != MOUNT_ERROR))
 		return 0;
 	return rc;
 }
@@ -949,6 +961,7 @@
 		rc = -ENOMEM;
 		goto out;
 	}
+	rc = 0;
 	subgraph_ctx = (struct ecryptfs_subgraph_ctx *)(*foo);
 	walker = &subgraph_ctx->head_val_node;
 	while (walker->next)
@@ -1023,8 +1036,7 @@
 		rc = -ENOMEM;
 		goto out_free_list_and_subgraph_ctx;
 	}
-	rc = 0;
-	stack_push(mnt_params, sig_mnt_opt);
+	rc = stack_push(mnt_params, sig_mnt_opt);
 out_free_list_and_subgraph_ctx:
 	curr = subgraph_ctx->head_val_node.next;
 	while (curr) {

=== modified file 'src/libecryptfs/module_mgr.c'
--- src/libecryptfs/module_mgr.c	2009-03-18 23:14:52 +0000
+++ src/libecryptfs/module_mgr.c	2009-04-21 17:59:16 +0000
@@ -97,57 +97,61 @@
 		.trans_func = sig_param_node_callback}}
 };
 
+/* returns: 1 for str=="yes" or "y", 0 for "no" or "n", -1 elsewhere */
+static int is_yes(const char *str)
+{
+	if (str) {
+		if (!strcmp(str,"y") || !strcmp(str,"yes"))
+			return 1;
+		if (!strcmp(str,"no") || !strcmp(str,"n"))
+			return 0;
+	}
+
+	return -1;
+}
+
+
+/* returns: 0 for success
+ *	    WRONG_VALUE if node->val is none of  'yes','y','no','n'
+ *	    <0 for error
+ */
+static int stack_push_if_yes(struct param_node *node, struct val_node **head,
+			     char *opt_name)
+{
+	int rc;
+
+	if (((rc=is_yes(node->val)) == 1) || (node->flags & PARAMETER_SET)) {
+		rc = stack_push(head, opt_name);
+	} else if (rc == -1)
+		rc = WRONG_VALUE;
+	free(node->val);
+	node->val = NULL;
+	return rc;
+}
+
 static int get_hmac(struct ecryptfs_ctx *ctx, struct param_node *node,
 		    struct val_node **head, void **foo)
 {
-	if (node->val && (*(node->val) == 'y')) {
-		stack_push(head, "ecryptfs_hmac");
-	} else if (node->flags & PARAMETER_SET) {
-		stack_push(head, "ecryptfs_hmac");
-		return 0;
-	}
-	free(node->val);
-	return 0;
+	return stack_push_if_yes(node, head, "ecryptfs_hmac");
 }
 
 static int get_passthrough(struct ecryptfs_ctx *ctx, struct param_node *node,
 			   struct val_node **head, void **foo)
 {
-	if (node->val && (*(node->val) == 'y')) {
-		stack_push(head, "ecryptfs_passthrough");
-	} else if (node->flags & PARAMETER_SET) {
-		stack_push(head, "ecryptfs_passthrough");
-		return 0;
-	}
-	free(node->val);
-	return 0;
+	return stack_push_if_yes(node, head, "ecryptfs_passthrough");
 }
 
 static int get_xattr(struct ecryptfs_ctx *ctx, struct param_node *node,
 			   struct val_node **head, void **foo)
 {
-	if (node->val && (*(node->val) == 'y')) {
-		stack_push(head, "ecryptfs_xattr_metadata");
-	} else if (node->flags & PARAMETER_SET) {
-		stack_push(head, "ecryptfs_xattr_metadata");
-		return 0;
-	}
-	free(node->val);
-	return 0;
+	return stack_push_if_yes(node, head, "ecryptfs_xattr_metadata");
 }
 
 static int get_encrypted_passthrough(struct ecryptfs_ctx *ctx,
 				     struct param_node *node,
 				     struct val_node **head, void **foo)
 {
-	if (node->val && (*(node->val) == 'y')) {
-		stack_push(head, "ecryptfs_encrypted_view");
-	} else if (node->flags & PARAMETER_SET) {
-		stack_push(head, "ecryptfs_encrypted_view");
-		return 0;
-	}
-	free(node->val);
-	return 0;
+	return stack_push_if_yes(node, head, "ecryptfs_encrypted_view");
 }
 
 static struct param_node end_param_node = {
@@ -221,9 +225,9 @@
 					struct param_node *node,
 					struct val_node **head, void **foo)
 {
-	int rc = 0;
+	int yn, rc = 0;
 
-	if ((node->val && (*(node->val) == 'y'))
+	if (((yn=is_yes(node->val)) > 0)
 	    || (node->flags & PARAMETER_SET)) {
 		int i;
 		struct val_node *val_node;
@@ -254,10 +258,16 @@
 			}
 			val_node = val_node->next;
 		}
-	}
+	} else if (node->val) {
+		if (yn < 0)
+			rc = WRONG_VALUE;
+	} else
+		/* default: no */;
 out_free:
-	if (node->val)
+	if (node->val) {
 		free(node->val);
+		node->val = NULL;
+	}
 	return rc;
 }
 

=== modified file 'src/pam_ecryptfs/pam_ecryptfs.c'
--- src/pam_ecryptfs/pam_ecryptfs.c	2009-04-07 22:33:58 +0000
+++ src/pam_ecryptfs/pam_ecryptfs.c	2009-04-21 17:42:24 +0000
@@ -67,6 +67,36 @@
 	}
 }
 
+/* returns: 0 for pam automounting not set, 1 for set, <0 for error */
+static int ecryptfs_pam_automount_set(const char *homedir)
+{
+	char *file_path;
+	int rc = 0;
+	struct stat s;
+	if (asprintf(
+		&file_path, "%s/.ecryptfs/%s",
+		homedir,
+		ECRYPTFS_DEFAULT_WRAPPED_PASSPHRASE_FILENAME) == -1)
+		return -ENOMEM;
+	if (stat(file_path, &s) != 0) {
+		if (errno != ENOENT)
+			rc = -errno;
+		goto out;
+	} 
+	free(file_path);
+	if (asprintf(&file_path, "%s/.ecryptfs/auto-mount", homedir) == -1)
+		return -ENOMEM;
+	if (stat(file_path, &s) != 0) {
+		if (errno != ENOENT)
+			rc = -errno;
+		goto out;
+	} 
+	rc = 1;
+out:
+	free(file_path);
+	return rc;
+}
+
 PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
 				   const char **argv)
 {
@@ -98,6 +128,8 @@
 		       "rc = [%ld]\n", username, rc);
 		goto out;
 	}
+	if (!ecryptfs_pam_automount_set(homedir))
+		return PAM_SUCCESS;
 	saved_uid = geteuid();
 	seteuid(uid);
 	rc = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&passphrase);
@@ -365,6 +397,8 @@
 		       "rc = [%ld]\n", username, rc);
 		goto out;
 	}
+	if (!ecryptfs_pam_automount_set(homedir))
+		return PAM_SUCCESS;
 	saved_uid = geteuid();
 	seteuid(uid);
 	if ((rc = pam_get_item(pamh, PAM_OLDAUTHTOK,

=== modified file 'src/utils/mount.ecryptfs.c'
--- src/utils/mount.ecryptfs.c	2009-02-27 23:10:56 +0000
+++ src/utils/mount.ecryptfs.c	2009-04-21 19:23:03 +0000
@@ -301,6 +301,7 @@
 	char yesno[4];
 	int i;
 	int rc;
+	int tries;
 
 	home = pw->pw_dir;
 	rc = asprintf(&dot_ecryptfs_dir, "%s/.ecryptfs", home);
@@ -328,41 +329,65 @@
 		       "it looks like you have never mounted with this key \n"
 		       "before. This could mean that you have typed your \n"
 		       "passphrase wrong.\n\n", sig_cache_filename);
-		printf("Would you like to proceed with the mount (yes/no)? ");
-		i = 0;
+		tries = 0;
 		do {
-			yesno[i++] = mygetchar();
-		} while (yesno[i-1] != '\n' && i < 3);
-		yesno[i] = '\0';
-		if (yesno[i-1] != '\n')
-			while (mygetchar() != '\n');
-		if (memcmp(yesno, "yes", 3) == 0) {
-			printf("Would you like to append sig [%s] to\n"
-			       "[%s] \n"
-			       "in order to avoid this warning in the future "
-			       "(yes/no)? ", auth_tok_sig, sig_cache_filename);
+			rc = 0;
+			printf("Would you like to proceed "
+			       "with the mount (yes/no)? ");
 			i = 0;
 			do {
 				yesno[i++] = mygetchar();
-			} while (yesno[i-1] != '\n' && i < 3);
-			yesno[i] = '\0';
-			if (yesno[i-1] != '\n')
+			} while (yesno[i-1] != '\n' && i < 4);
+			if (yesno[i-1] != '\n') {
 				while (mygetchar() != '\n');
-			if (memcmp(yesno, "yes", 3) == 0) {
+				yesno[0] = '\0';
+			}
+			yesno[i-1] = '\0';
+		} while ((rc = strcmp(yesno, "yes")) && strcmp(yesno, "no")
+			 && (++tries < 5));
+		if (rc == 0) {
+			tries = 0;
+			do {
+				printf("Would you like to append sig [%s] to\n"
+				       "[%s] \nin order to avoid this warning "
+				       "in the future (yes/no)? ", auth_tok_sig,
+				       sig_cache_filename);
+				i = 0;
+				do {
+					yesno[i++] = mygetchar();
+				} while (yesno[i-1] != '\n' && i < 4);
+				if (yesno[i-1] != '\n') {
+					while (mygetchar() != '\n');
+					yesno[0] = '\0';
+				}
+				yesno[i-1] = '\0';
+			} while ((rc = strcmp(yesno, "yes")) 
+				 && strcmp(yesno, "no") && (++tries < 5));
+
+			if (rc == 0) {
 				if ((rc = ecryptfs_append_sig(
-					     auth_tok_sig,
-					     sig_cache_filename))) {
+					    auth_tok_sig,
+					    sig_cache_filename))) {
 					printf("Error appending to [%s]; rc = "
-					       "[%d]. Aborting mount.\n",
-					       sig_cache_filename, rc);
+					"[%d]. Aborting mount.\n",
+					sig_cache_filename, rc);
 					goto out;
 				}
 				printf("Successfully appended new sig to user "
-				       "sig cache file\n");
-			} else
-				printf("Not adding sig to user sig cache "
-				       "file; continuing with mount.\n");
+					"sig cache file\n");
+			} else {
+				if (strcmp(yesno,"no"))
+					rc = -EINVAL;
+				else {
+					printf("Not adding sig to user sig "
+					       "cache file; continuing with "
+					       "mount.\n");
+					rc = 0;
+				}
+			}
 		} else {
+			if (strcmp(yesno,"no"))
+				rc = -EINVAL;
 			printf("Aborting mount.\n");
 			rc = ECANCELED;
 			goto out;
@@ -600,6 +625,8 @@
 			&ctx, &mnt_params, version, opts_str,
 			ECRYPTFS_ASK_FOR_ALL_MOUNT_OPTIONS);
 		if (rc) {
+			if (rc > 0) 
+				rc = -EINVAL;
 			printf("Error attempting to evaluate mount options: "
 			       "[%d] %s\nCheck your system logs for details "
 			       "on why this happened.\nTry updating your "

=== modified file 'src/utils/umount.ecryptfs.c'
--- src/utils/umount.ecryptfs.c	2009-03-20 16:29:31 +0000
+++ src/utils/umount.ecryptfs.c	2009-04-21 18:08:22 +0000
@@ -109,7 +109,8 @@
 		fekek_fail = ecryptfs_remove_auth_tok_from_keyring(fekek_sig);
 		if (fekek_fail)
 			fprintf(stderr, "Failed to remove fekek with sig [%s] "
-				"from keyring: %s\n", fekek_sig, strerror(rc));
+				"from keyring: %s\n", fekek_sig,
+				strerror(fekek_fail));
 	} else {
 		fekek_fail = rc;
 	}
@@ -117,9 +118,10 @@
 				 "ecryptfs_fnek_sig=", &fnek_sig)
 	    && strcmp(fekek_sig, fnek_sig)) {
 		fnek_fail = ecryptfs_remove_auth_tok_from_keyring(fnek_sig);
-		if (fekek_fail) {
+		if (fnek_fail) {
 			fprintf(stderr, "Failed to remove fnek with sig [%s] "
-				"from keyring: %s\n", fekek_sig, strerror(rc));
+				"from keyring: %s\n", fnek_sig, 
+				strerror(fnek_fail));
 		}
 	}
 	free(fekek_sig);