util: beef up logic to find ctty name

[elogind.git] / src / cryptsetup.c

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 48b2c9ce1b0a1c7852e4304d14ba83346b73952b..c80572aed9672f26c0255cbac561182b21a017dc 100644 (file)
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[]) {
                         if (!key_file) {
                                 char *text;
 
-                                if (asprintf(&text, "Please enter passphrase for disk %s!", argv[2]) < 0) {
+                                if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) {
                                         log_error("Out of memory");
                                         goto finish;
                                 }
@@ -290,7 +290,7 @@ int main(int argc, char *argv[]) {
                                 if (opt_verify) {
                                         char *password2 = NULL;
 
-                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", argv[2]) < 0) {
+                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) {
                                                 log_error("Out of memory");
                                                 goto finish;
                                         }
@@ -386,6 +386,7 @@ int main(int argc, char *argv[]) {
                 if (try >= opt_tries) {
                         log_error("Too many attempts.");
                         r = EXIT_FAILURE;
+                        goto finish;
                 }
 
         } else if (streq(argv[1], "detach")) {