X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=a14d7c822bab00722054a76f2f4db7d2ea365cef;hb=ea18a4b57e2bb94af7b3ecb7abdaec40e9f485f0;hp=28e8b44ccd499a26e4e6daf2a9056c0d520f6052;hpb=ab9001a1e3dc6e60d0cdf53363dc5d18dcc382fd;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 28e8b44cc..a14d7c822 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -157,9 +157,9 @@ static int rename_service(sd_bus *a, sd_bus *b) { /* The status string gets the full command line ... */ sd_notifyf(false, - "STATUS=Processing requests from client PID %lu (%s); UID %lu (%s)", - (unsigned long) pid, p, - (unsigned long) uid, name); + "STATUS=Processing requests from client PID "PID_FMT" (%s); UID "UID_FMT" (%s)", + pid, p, + uid, name); /* ... and the argv line only the short comm */ if (arg_command_line_buffer) { @@ -167,17 +167,17 @@ static int rename_service(sd_bus *a, sd_bus *b) { m = strlen(arg_command_line_buffer); w = snprintf(arg_command_line_buffer, m, - "[PID %lu/%s; UID %lu/%s]", - (unsigned long) pid, comm, - (unsigned long) uid, name); + "[PID "PID_FMT"/%s; UID "UID_FMT"/%s]", + pid, comm, + uid, name); if (m > w) memset(arg_command_line_buffer + w, 0, m - w); } - log_debug("Running on behalf of PID %lu (%s), UID %lu (%s), %s", - (unsigned long) pid, p, - (unsigned long) uid, name, + log_debug("Running on behalf of PID "PID_FMT" (%s), UID "UID_FMT" (%s), %s", + pid, p, + uid, name, a->unique_name); ; return 0;