SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-id128: split the logic obtaining invocation ID from sd_id128_get_invocation()

Browse Source
This commit is contained in:
Yu Watanabe
2019-03-15 18:53:23 +09:00
parent 9363e2f499
commit 8efb042e0c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-id128/sd-id128.c
+13 -7
View File
@@ -215,6 +215,18 @@ static int get_invocation_from_keyring(sd_id128_t *ret) {
return 1;
}
static int get_invocation_from_environment(sd_id128_t *ret) {
const char *e;
assert(ret);
e = secure_getenv("INVOCATION_ID");
if (!e)
return -ENXIO;
return sd_id128_from_string(e, ret);
}
_public_ int sd_id128_get_invocation(sd_id128_t *ret) {
static thread_local sd_id128_t saved_invocation_id = {};
int r;
@@ -237,13 +249,7 @@ _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
return r;
if (r == 0) {
const char *e;
e = secure_getenv("INVOCATION_ID");
if (!e)
return -ENXIO;
r = sd_id128_from_string(e, &saved_invocation_id);
r = get_invocation_from_environment(&saved_invocation_id);
if (r < 0)
return r;
}