}
} else if (strstr(args[0], "user")) {
- uint32_t uid;
+ uid_t uid;
+ uint32_t u;
- if (safe_atou(args[i], &uid) < 0) {
+ if (parse_uid(args[i], &uid) < 0) {
struct passwd *pw;
pw = getpwnam(args[i]);
goto finish;
}
+ u = (uint32_t) uid;
if (!dbus_message_append_args(m,
- DBUS_TYPE_UINT32, &uid,
+ DBUS_TYPE_UINT32, &u,
DBUS_TYPE_INVALID)) {
log_error("Could not append arguments to message.");
ret = -ENOMEM;
b = streq(args[0], "enable-linger");
for (i = 1; i < n; i++) {
- uint32_t uid;
+ uint32_t u;
+ uid_t uid;
m = dbus_message_new_method_call(
"org.freedesktop.login1",
goto finish;
}
- if (safe_atou32(args[i], &uid) < 0) {
+ if (parse_uid(args[i], &uid) < 0) {
struct passwd *pw;
errno = 0;
uid = pw->pw_uid;
}
+ u = (uint32_t) uid;
if (!dbus_message_append_args(m,
- DBUS_TYPE_UINT32, &uid,
+ DBUS_TYPE_UINT32, &u,
DBUS_TYPE_BOOLEAN, &b,
DBUS_TYPE_BOOLEAN, &interactive,
DBUS_TYPE_INVALID)) {
for (i = 1; i < n; i++) {
uint32_t u;
+ uid_t uid;
m = dbus_message_new_method_call(
"org.freedesktop.login1",
goto finish;
}
- if (safe_atou32(args[i], &u) < 0) {
+ if (parse_uid(args[i], &uid) < 0) {
struct passwd *pw;
errno = 0;
goto finish;
}
- u = pw->pw_uid;
+ uid = pw->pw_uid;
}
+ u = (uint32_t) uid;
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &u,
DBUS_TYPE_INVALID)) {
arg_kill_who = "all";
for (i = 1; i < n; i++) {
+ uid_t uid;
uint32_t u;
m = dbus_message_new_method_call(
goto finish;
}
- if (safe_atou32(args[i], &u) < 0) {
+ if (parse_uid(args[i], &uid) < 0) {
struct passwd *pw;
errno = 0;
goto finish;
}
- u = pw->pw_uid;
+ uid = pw->pw_uid;
}
+ u = (uint32_t) uid;
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &u,
DBUS_TYPE_INT32, arg_signal,