projects / packages / ecryptfs-utils.git / blame
| Commit | Line | Data |
|---|---|---|
| bc1c8867 AM |
1 | diff -up ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.c |
| 2 | --- ecryptfs-utils-83/src/libecryptfs/key_management.c.splitnss 2010-02-16 17:59:21.000000000 +0100 | |
| 3 | +++ ecryptfs-utils-83/src/libecryptfs/key_management.c 2010-05-04 11:08:19.875872481 +0200 | |
| 4 | @@ -133,28 +133,8 @@ out: | |
| 5 | } | |
| 6 | ||
| 7 | ||
| 8 | -int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig) | |
| 9 | -{ | |
| 10 | - int rc; | |
| 11 | +#include "key_management.inc.c" | |
| 12 | ||
| 13 | - rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0); | |
| 14 | - if (rc < 0) { | |
| 15 | - rc = errno; | |
| 16 | - syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n", | |
| 17 | - auth_tok_sig); | |
| 18 | - goto out; | |
| 19 | - } | |
| 20 | - rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING); | |
| 21 | - if (rc < 0) { | |
| 22 | - rc = errno; | |
| 23 | - syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n", | |
| 24 | - auth_tok_sig, strerror(rc)); | |
| 25 | - goto out; | |
| 26 | - } | |
| 27 | - rc = 0; | |
| 28 | -out: | |
| 29 | - return rc; | |
| 30 | -} | |
| 31 | int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok, | |
| 32 | char *auth_tok_sig) | |
| 33 | { | |
| 34 | diff -up ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-83/src/libecryptfs/key_management.inc.c | |
| 35 | --- ecryptfs-utils-83/src/libecryptfs/key_management.inc.c.splitnss 2010-05-04 11:08:19.875872481 +0200 | |
| 36 | +++ ecryptfs-utils-83/src/libecryptfs/key_management.inc.c 2010-05-04 11:08:19.875872481 +0200 | |
| 37 | @@ -0,0 +1,22 @@ | |
| 38 | +int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig) | |
| 39 | +{ | |
| 40 | + int rc; | |
| 41 | + | |
| 42 | + rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0); | |
| 43 | + if (rc < 0) { | |
| 44 | + rc = errno; | |
| 45 | + syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n", | |
| 46 | + auth_tok_sig); | |
| 47 | + goto out; | |
| 48 | + } | |
| 49 | + rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING); | |
| 50 | + if (rc < 0) { | |
| 51 | + rc = errno; | |
| 52 | + syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n", | |
| 53 | + auth_tok_sig, strerror(rc)); | |
| 54 | + goto out; | |
| 55 | + } | |
| 56 | + rc = 0; | |
| 57 | +out: | |
| 58 | + return rc; | |
| 59 | +} | |
| 60 | diff -up ecryptfs-utils-83/src/utils/Makefile.am.splitnss ecryptfs-utils-83/src/utils/Makefile.am | |
| 61 | --- ecryptfs-utils-83/src/utils/Makefile.am.splitnss 2010-05-04 11:09:05.176554494 +0200 | |
| 62 | +++ ecryptfs-utils-83/src/utils/Makefile.am 2010-05-04 11:09:05.200991500 +0200 | |
| 63 | @@ -36,7 +36,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K | |
| 64 | mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) | |
| 65 | umount_ecryptfs_SOURCES = umount.ecryptfs.c | |
| 66 | umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) | |
| 67 | -umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la | |
| 68 | +umount_ecryptfs_LDADD = -lkeyutils | |
| 69 | ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c | |
| 70 | ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) | |
| 71 | ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) | |
| 72 | diff -up ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-83/src/utils/umount.ecryptfs.c | |
| 73 | --- ecryptfs-utils-83/src/utils/umount.ecryptfs.c.splitnss 2009-10-20 20:49:55.000000000 +0200 | |
| 74 | +++ ecryptfs-utils-83/src/utils/umount.ecryptfs.c 2010-05-04 11:08:19.893867192 +0200 | |
| 75 | @@ -24,7 +24,10 @@ | |
| 76 | #include <stdlib.h> | |
| 77 | #include <string.h> | |
| 78 | #include <unistd.h> | |
| 79 | -#include "ecryptfs.h" | |
| 80 | +#include <keyutils.h> | |
| 81 | +#include <syslog.h> | |
| 82 | + | |
| 83 | +#include "../libecryptfs/key_management.inc.c" | |
| 84 | ||
| 85 | static void usage() | |
| 86 | { |