diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 2b0ced7b7d..6fea347e4c 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -1090,7 +1090,7 @@ static int ask_password_conv( if (creds_dir) { if (setenv("CREDENTIALS_DIRECTORY", creds_dir, /* overwrite= */ true) < 0) - return log_error_errno(r, "Failed to set $CREDENTIALS_DIRECTORY: %m"); + return log_error_errno(errno, "Failed to set $CREDENTIALS_DIRECTORY: %m"); } else (void) unsetenv("CREDENTIALS_DIRECTORY"); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index af7ed43672..011162865b 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -1114,7 +1114,7 @@ static int verb_tlsa(int argc, char *argv[], uintptr_t _data, void *userdata) { static int varlink_dump_dns_configuration(sd_json_variant **ret) { _cleanup_(sd_varlink_unrefp) sd_varlink *vl = NULL; - _cleanup_(sd_json_variant_unrefp) sd_json_variant *reply = NULL; + sd_json_variant *reply = NULL; sd_json_variant *v; int r; @@ -1133,7 +1133,6 @@ static int varlink_dump_dns_configuration(sd_json_variant **ret) { if (!sd_json_variant_is_array(v)) return log_error_errno(SYNTHETIC_ERRNO(ENODATA), "DumpDNSConfiguration() response missing 'configuration' key."); - TAKE_PTR(reply); *ret = sd_json_variant_ref(v); return 0; }