core: fix %U when no User= used

When the username was not explicitly specified, both %U and %u would
print the username. Make %U always print UID.
parent d848b9cb
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "strv.h" #include "strv.h"
#include "unit-name.h" #include "unit-name.h"
#include "unit-printf.h" #include "unit-printf.h"
#include "macro.h"
static char *specifier_prefix_and_instance(char specifier, void *data, void *userdata) { static char *specifier_prefix_and_instance(char specifier, void *data, void *userdata) {
Unit *u = userdata; Unit *u = userdata;
...@@ -123,6 +124,7 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) { ...@@ -123,6 +124,7 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) {
ExecContext *c; ExecContext *c;
int r; int r;
const char *username; const char *username;
char _cleanup_free_ *tmp = NULL;
uid_t uid; uid_t uid;
char *printed = NULL; char *printed = NULL;
...@@ -130,12 +132,13 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) { ...@@ -130,12 +132,13 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) {
c = unit_get_exec_context(u); c = unit_get_exec_context(u);
/* get USER env from our own env if set */ if (c && c->user)
if (!c || !c->user) username = c->user;
return getusername_malloc(); else
/* get USER env from env or our own uid */
username = tmp = getusername_malloc();
/* fish username from passwd */ /* fish username from passwd */
username = c->user;
r = get_user_creds(&username, &uid, NULL, NULL, NULL); r = get_user_creds(&username, &uid, NULL, NULL, NULL);
if (r < 0) if (r < 0)
return NULL; return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment