diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
| commit | 79bec997c911be7c903db9f7e5d07ab2cd303ed7 (patch) | |
| tree | 1e6e62138a8920a3210b8063157612b484efbea6 /src/shared/path-lookup.c | |
| parent | f74431288aec78ffdd05be9a519eab3dbe1c4f81 (diff) | |
| parent | e287086b8aa2558356af225a12d9bfea8e7d61ca (diff) | |
Merge pull request #1484 from poettering/ask-pass-kernel-keyring
cache harddisk passwords in the kernel keyring
Diffstat (limited to 'src/shared/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index d803bbe07e..34eec959ef 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -181,7 +181,7 @@ static char** user_dirs( if (strv_extend_strv_concat(&res, config_dirs, "/systemd/user") < 0) return NULL; - if (strv_extend_strv(&res, (char**) config_unit_paths) < 0) + if (strv_extend_strv(&res, (char**) config_unit_paths, false) < 0) return NULL; if (runtime_dir) @@ -203,7 +203,7 @@ static char** user_dirs( if (strv_extend_strv_concat(&res, data_dirs, "/systemd/user") < 0) return NULL; - if (strv_extend_strv(&res, (char**) data_unit_paths) < 0) + if (strv_extend_strv(&res, (char**) data_unit_paths, false) < 0) return NULL; if (generator_late) @@ -318,7 +318,7 @@ int lookup_paths_init( if (!unit_path) return -ENOMEM; - r = strv_extend_strv(&p->unit_path, unit_path); + r = strv_extend_strv(&p->unit_path, unit_path, false); if (r < 0) return r; } |