From d69e53323874c0359e0bfa062abf9f18dced50c7 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Apr 16 2010 11:05:27 +0000
Subject: - make salt working together with passwd_file


---

diff --git a/ecryptfs-utils-83-fixsalt.patch b/ecryptfs-utils-83-fixsalt.patch
new file mode 100644
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,
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index b552d37..5947286 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -5,7 +5,7 @@
 
 Name: ecryptfs-utils
 Version: 83
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -20,6 +20,9 @@ Patch1: ecryptfs-utils-75-werror.patch
 # rhbz#500829, do not use ubuntu/debian only service
 Patch2: ecryptfs-utils-75-nocryptdisks.patch
 
+# rhbz#553629, fix usage of salt together with file_passwd
+Patch3: ecryptfs-utils-83-fixsalt.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, util-linux-ng
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
@@ -58,6 +61,7 @@ the interface supplied by the ecryptfs-utils library.
 %setup -q
 %patch1 -p1 -b .werror
 %patch2 -p1 -b .nocryptdisks
+%patch3 -p1 -b .fixsalt
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
@@ -175,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Fri Apr 16 2010 Michal Hlavinka <mhlavink@redhat.com> - 83-4
+- make salt working together with passwd_file
+
 * Mon Mar 22 2010 Michal Hlavinka <mhlavink@redhat.com> - 83-3
 - enable PKCS#11 support