diff options
| author | David Härdeman <david@hardeman.nu> | 2014-03-25 11:05:23 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-04-24 09:23:54 +0200 |
| commit | 9fa1de965a0954dcb6d855ebe0513077515a0daa (patch) | |
| tree | 7c6c8133d726a7d379361c4541fe15cb20bd7342 /src/ask-password | |
| parent | 0d522a7a0547982eae9ab1b5971e4bed9c2fbc7c (diff) | |
Add more password agent information
Add an (optional) "Id" key in the password agent .ask files. The Id is
supposed to be a simple string in "<subsystem>:<target>" form which
is used to provide more information on what the requested passphrase
is to be used for (which e.g. allows an agent to only react to cryptsetup
requests).
(v2: rebased, fixed indentation, escape name, use strappenda)
Diffstat (limited to 'src/ask-password')
| -rw-r--r-- | src/ask-password/ask-password.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index ea0c62397e..4d5690c2c0 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -43,6 +43,7 @@ #include "def.h" static const char *arg_icon = NULL; +static const char *arg_id = NULL; static const char *arg_message = NULL; static bool arg_use_tty = true; static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC; @@ -58,7 +59,8 @@ static int help(void) { " --timeout=SEC Timeout in sec\n" " --no-tty Ask question via agent even on TTY\n" " --accept-cached Accept cached passwords\n" - " --multiple List multiple passwords if available\n", + " --multiple List multiple passwords if available\n" + " --id=ID Query identifier (e.g. cryptsetup:/dev/sda5)\n", program_invocation_short_name); return 0; @@ -71,7 +73,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_TIMEOUT, ARG_NO_TTY, ARG_ACCEPT_CACHED, - ARG_MULTIPLE + ARG_MULTIPLE, + ARG_ID }; static const struct option options[] = { @@ -81,6 +84,7 @@ static int parse_argv(int argc, char *argv[]) { { "no-tty", no_argument, NULL, ARG_NO_TTY }, { "accept-cached", no_argument, NULL, ARG_ACCEPT_CACHED }, { "multiple", no_argument, NULL, ARG_MULTIPLE }, + { "id", required_argument, NULL, ARG_ID }, {} }; @@ -119,6 +123,10 @@ static int parse_argv(int argc, char *argv[]) { arg_multiple = true; break; + case ARG_ID: + arg_id = optarg; + break; + case '?': return -EINVAL; @@ -162,7 +170,7 @@ int main(int argc, char *argv[]) { } else { char **l; - if ((r = ask_password_agent(arg_message, arg_icon, timeout, arg_accept_cached, &l)) >= 0) { + if ((r = ask_password_agent(arg_message, arg_icon, arg_id, timeout, arg_accept_cached, &l)) >= 0) { char **p; STRV_FOREACH(p, l) { |