rpms/ecryptfs-utils/F-12 ecryptfs-utils-83-fixsalt.patch, NONE, 1.1 ecryptfs-utils.spec, 1.61, 1.62

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/pkgs/rpms/ecryptfs-utils/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25940

Modified Files:
	ecryptfs-utils.spec 
Added Files:
	ecryptfs-utils-83-fixsalt.patch 
Log Message:
* Fri Apr 16 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-4
- make salt working together with passwd_file 


ecryptfs-utils-83-fixsalt.patch:
 ecryptfs_key_mod_passphrase.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ecryptfs-utils-83-fixsalt.patch ---
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,


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-12/ecryptfs-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- ecryptfs-utils.spec	22 Mar 2010 09:14:33 -0000	1.61
+++ ecryptfs-utils.spec	16 Apr 2010 12:09:49 -0000	1.62
@@ -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-u
 %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 at redhat.com> - 83-4
+- make salt working together with passwd_file 
+
 * Mon Mar 22 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-3
 - enable PKCS#11 support