diff -up ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.c

--- ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss	2010-02-16 17:59:21.000000000 +0100

+++ ecryptfs-utils-83/src/libecryptfs/key_management.c	2010-05-04 11:08:19.875872481 +0200

@@ -133,28 +133,8 @@ out:

 }

-int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)

-{

-	int rc;

+#include "key_management.inc.c"

-	rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);

-	if (rc < 0) {

-		rc = errno;

-		syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",

-		       auth_tok_sig);

-		goto out;

-	}

-	rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);

-	if (rc < 0) {

-		rc = errno;

-		syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",

-		       auth_tok_sig, strerror(rc));

-		goto out;

-	}

-	rc = 0;

-out:

-	return rc;

-}

 int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok,

 				     char *auth_tok_sig)

 {

diff -up ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.inc.c

--- ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss	2010-05-04 11:08:19.875872481 +0200

+++ ecryptfs-utils-83/src/libecryptfs/key_management.inc.c	2010-05-04 11:08:19.875872481 +0200

@@ -0,0 +1,22 @@

+int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)

+{

+	int rc;

+

+	rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);

+	if (rc < 0) {

+		rc = errno;

+		syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",

+		       auth_tok_sig);

+		goto out;

+	}

+	rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);

+	if (rc < 0) {

+		rc = errno;

+		syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",

+		       auth_tok_sig, strerror(rc));

+		goto out;

+	}

+	rc = 0;

+out:

+	return rc;

+}

diff -up ecryptfs-utils-83/src/utils/Makefile.am.splitnss ecryptfs-utils-83/src/utils/Makefile.am

--- ecryptfs-utils-83/src/utils/Makefile.am.splitnss	2010-05-04 11:09:05.176554494 +0200

+++ ecryptfs-utils-83/src/utils/Makefile.am	2010-05-04 11:09:05.200991500 +0200

@@ -36,7 +36,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K

 mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)

 umount_ecryptfs_SOURCES = umount.ecryptfs.c

 umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS)

-umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la

+umount_ecryptfs_LDADD = -lkeyutils

 ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c

 ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)

 ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)

diff -up ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-83/src/utils/umount.ecryptfs.c

--- ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss	2009-10-20 20:49:55.000000000 +0200

+++ ecryptfs-utils-83/src/utils/umount.ecryptfs.c	2010-05-04 11:08:19.893867192 +0200

@@ -24,7 +24,10 @@

 #include <stdlib.h>

 #include <string.h>

 #include <unistd.h>

-#include "ecryptfs.h"

+#include <keyutils.h>

+#include <syslog.h>

+

+#include "../libecryptfs/key_management.inc.c"

 static void usage()

 {