diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
| commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /fs/ecryptfs/debug.c | |
| parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
| download | kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.tar.gz kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.tar.xz kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.zip | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'fs/ecryptfs/debug.c')
| -rw-r--r-- | fs/ecryptfs/debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ecryptfs/debug.c b/fs/ecryptfs/debug.c index 61f8e894284..434c7efd80f 100644 --- a/fs/ecryptfs/debug.c +++ b/fs/ecryptfs/debug.c @@ -36,7 +36,7 @@ void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok) ecryptfs_printk(KERN_DEBUG, "Auth tok at mem loc [%p]:\n", auth_tok); - if (ECRYPTFS_CHECK_FLAG(auth_tok->flags, ECRYPTFS_PRIVATE_KEY)) { + if (auth_tok->flags & ECRYPTFS_PRIVATE_KEY) { ecryptfs_printk(KERN_DEBUG, " * private key type\n"); ecryptfs_printk(KERN_DEBUG, " * (NO PRIVATE KEY SUPPORT " "IN ECRYPTFS VERSION 0.1)\n"); @@ -46,8 +46,8 @@ void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok) ECRYPTFS_SALT_SIZE); salt[ECRYPTFS_SALT_SIZE * 2] = '\0'; ecryptfs_printk(KERN_DEBUG, " * salt = [%s]\n", salt); - if (ECRYPTFS_CHECK_FLAG(auth_tok->token.password.flags, - ECRYPTFS_PERSISTENT_PASSWORD)) { + if (auth_tok->token.password.flags & + ECRYPTFS_PERSISTENT_PASSWORD) { ecryptfs_printk(KERN_DEBUG, " * persistent\n"); } memcpy(sig, auth_tok->token.password.signature, |