Blame SOURCES/ecryptfs-utils-83-splitnss.patch

9471b7
diff -up ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.c
9471b7
--- ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss	2015-03-26 14:28:59.000000000 +0100
9471b7
+++ ecryptfs-utils-108/src/libecryptfs/key_management.c	2015-08-11 14:43:53.489838127 +0200
9471b7
@@ -138,28 +138,8 @@ out:
Michal Hlavinka 14f1a4
 }
Michal Hlavinka 14f1a4
 
Michal Hlavinka 14f1a4
 
Michal Hlavinka 14f1a4
-int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)
Michal Hlavinka 14f1a4
-{
Michal Hlavinka 14f1a4
-	int rc;
Michal Hlavinka 14f1a4
+#include "key_management.inc.c"
Michal Hlavinka 14f1a4
 
Michal Hlavinka 14f1a4
-	rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);
Michal Hlavinka 14f1a4
-	if (rc < 0) {
Michal Hlavinka 14f1a4
-		rc = errno;
Michal Hlavinka 14f1a4
-		syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",
Michal Hlavinka 14f1a4
-		       auth_tok_sig);
Michal Hlavinka 14f1a4
-		goto out;
Michal Hlavinka 14f1a4
-	}
Michal Hlavinka 14f1a4
-	rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);
Michal Hlavinka 14f1a4
-	if (rc < 0) {
Michal Hlavinka 14f1a4
-		rc = errno;
Michal Hlavinka 14f1a4
-		syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",
Michal Hlavinka 14f1a4
-		       auth_tok_sig, strerror(rc));
Michal Hlavinka 14f1a4
-		goto out;
Michal Hlavinka 14f1a4
-	}
Michal Hlavinka 14f1a4
-	rc = 0;
Michal Hlavinka 14f1a4
-out:
Michal Hlavinka 14f1a4
-	return rc;
Michal Hlavinka 14f1a4
-}
Michal Hlavinka 14f1a4
 int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok,
Michal Hlavinka 14f1a4
 				     char *auth_tok_sig)
Michal Hlavinka 14f1a4
 {
9471b7
diff -up ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.inc.c
9471b7
--- ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss	2015-08-11 14:43:53.489838127 +0200
9471b7
+++ ecryptfs-utils-108/src/libecryptfs/key_management.inc.c	2015-08-11 14:43:53.489838127 +0200
Michal Hlavinka 14f1a4
@@ -0,0 +1,22 @@
Michal Hlavinka 14f1a4
+int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)
Michal Hlavinka 14f1a4
+{
Michal Hlavinka 14f1a4
+	int rc;
Michal Hlavinka 14f1a4
+
Michal Hlavinka 14f1a4
+	rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);
Michal Hlavinka 14f1a4
+	if (rc < 0) {
Michal Hlavinka 14f1a4
+		rc = errno;
Michal Hlavinka 14f1a4
+		syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",
Michal Hlavinka 14f1a4
+		       auth_tok_sig);
Michal Hlavinka 14f1a4
+		goto out;
Michal Hlavinka 14f1a4
+	}
Michal Hlavinka 14f1a4
+	rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);
Michal Hlavinka 14f1a4
+	if (rc < 0) {
Michal Hlavinka 14f1a4
+		rc = errno;
Michal Hlavinka 14f1a4
+		syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",
Michal Hlavinka 14f1a4
+		       auth_tok_sig, strerror(rc));
Michal Hlavinka 14f1a4
+		goto out;
Michal Hlavinka 14f1a4
+	}
Michal Hlavinka 14f1a4
+	rc = 0;
Michal Hlavinka 14f1a4
+out:
Michal Hlavinka 14f1a4
+	return rc;
Michal Hlavinka 14f1a4
+}
9471b7
diff -up ecryptfs-utils-108/src/utils/Makefile.am.splitnss ecryptfs-utils-108/src/utils/Makefile.am
9471b7
--- ecryptfs-utils-108/src/utils/Makefile.am.splitnss	2015-02-10 17:59:34.000000000 +0100
9471b7
+++ ecryptfs-utils-108/src/utils/Makefile.am	2015-08-11 14:43:53.489838127 +0200
cac1ea
@@ -39,7 +39,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K
Michal Hlavinka 14f1a4
 mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
Michal Hlavinka 14f1a4
 umount_ecryptfs_SOURCES = umount.ecryptfs.c
Michal Hlavinka 14f1a4
 umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS)
Michal Hlavinka 14f1a4
-umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
Michal Hlavinka 14f1a4
+umount_ecryptfs_LDADD = -lkeyutils
Michal Hlavinka 14f1a4
 ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c
Michal Hlavinka 14f1a4
 ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
Michal Hlavinka 14f1a4
 ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
9471b7
diff -up ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-108/src/utils/umount.ecryptfs.c
9471b7
--- ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss	2015-02-10 17:59:34.000000000 +0100
9471b7
+++ ecryptfs-utils-108/src/utils/umount.ecryptfs.c	2015-08-11 14:43:53.489838127 +0200
Michal Hlavinka 14f1a4
@@ -24,7 +24,10 @@
Michal Hlavinka 14f1a4
 #include <stdlib.h>
Michal Hlavinka 14f1a4
 #include <string.h>
Michal Hlavinka 14f1a4
 #include <unistd.h>
Michal Hlavinka 14f1a4
-#include "ecryptfs.h"
Michal Hlavinka 14f1a4
+#include <keyutils.h>
Michal Hlavinka 14f1a4
+#include <syslog.h>
Michal Hlavinka 14f1a4
+
Michal Hlavinka 14f1a4
+#include "../libecryptfs/key_management.inc.c"
Michal Hlavinka 14f1a4
 
Michal Hlavinka 14f1a4
 static void usage()
Michal Hlavinka 14f1a4
 {