- rel 2; patches from fc

[packages/ecryptfs-utils.git] / ecryptfs-utils-83-fixsalt.patch

diff --git a/ecryptfs-utils-83-fixsalt.patch b/ecryptfs-utils-83-fixsalt.patch
new file mode 100644 (file)
index 0000000..01f3e50
--- /dev/null
+++ b/ecryptfs-utils-83-fixsalt.patch
@@ -0,0 +1,12 @@
+diff -up ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c
+--- ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c.fixsalt        2009-10-20 20:49:55.000000000 +0200
++++ ecryptfs-utils-83/src/key_mod/ecryptfs_key_mod_passphrase.c        2010-04-14 16:18:43.273398808 +0200
+@@ -105,7 +105,7 @@ static int tf_pass_file(struct ecryptfs_
+ out:
+       free(node->val);
+       node->val = NULL;
+-      return rc;
++      return rc ? rc : DEFAULT_TOK;
+ }
+ 
+ static int tf_salt(struct ecryptfs_ctx *ctx, struct param_node *node,