[systemd-commits] src/cryptsetup

[Dave Reisner]

 src/cryptsetup/cryptsetup.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8db9d8c2a4ef9806c286e258f9932a0972dc2375
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Tue Nov 6 10:17:18 2012 -0500

    cryptsetup: fix inverted comparison in pass_volume_key

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index e8ba3f0..56a3b50 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -468,7 +468,8 @@ int main(int argc, char *argv[]) {
                                                  opt_keyfile_size,
                                                  &params);
 
-                                pass_volume_key = !!hash;
+                                /* hash == NULL implies the user passed "plain" */
+                                pass_volume_key = (hash == NULL);
                         }
 
                         if (k < 0) {