chiark / gitweb /
ask-password: properly accept empty passwords from agent
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Apr 2011 19:24:17 +0000 (21:24 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Apr 2011 19:24:17 +0000 (21:24 +0200)
src/ask-password-api.c

index da967ab..384cfc8 100644 (file)
@@ -481,7 +481,13 @@ int ask_password_agent(
                 if (passphrase[0] == '+') {
                         char **l;
 
-                        if (!(l = strv_parse_nulstr(passphrase+1, n-1))) {
+                        if (n == 1)
+                                l = strv_new("", NULL);
+                        else
+                                l = strv_parse_nulstr(passphrase+1, n-1);
+                                /* An empty message refers to the empty password */
+
+                        if (!l) {
                                 r = -ENOMEM;
                                 goto finish;
                         }