diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-07 11:26:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-07 12:26:14 +0200 |
| commit | e287086b8aa2558356af225a12d9bfea8e7d61ca (patch) | |
| tree | 934632ad37a839938f519a800a29c7541741a1b4 /src/core | |
| parent | 0084360296429b2068c1a4d4d4263083a8963b02 (diff) | |
ask-password: add support for caching passwords in the kernel keyring
This adds support for caching harddisk passwords in the kernel keyring
if it is available, thus supporting caching without Plymouth being
around.
This is also useful for hooking up "gdm-auto-login" with the collected
boot-time harddisk password, in order to support gnome keyring
passphrase unlocking via the HDD password, if it is the same.
Any passwords added to the kernel keyring this way have a timeout of
2.5min at which time they are purged from the kernel.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 2 | ||||
| -rw-r--r-- | src/core/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 4664af873f..f5baad05f3 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2725,7 +2725,7 @@ int exec_command_append(ExecCommand *c, const char *path, ...) { if (!l) return -ENOMEM; - r = strv_extend_strv(&c->argv, l); + r = strv_extend_strv(&c->argv, l, false); if (r < 0) return r; diff --git a/src/core/main.c b/src/core/main.c index 2406832694..2256fc5b33 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -601,7 +601,7 @@ static int config_parse_join_controllers(const char *unit, for (a = arg_join_controllers; *a; a++) { if (strv_overlap(*a, l)) { - if (strv_extend_strv(&l, *a) < 0) { + if (strv_extend_strv(&l, *a, false) < 0) { strv_free(l); strv_free_free(t); return log_oom(); |