diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-11-28 20:51:01 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-11-28 20:55:04 +0100 |
| commit | fed1e721fd0c81e60c77120539f34e16c2585634 (patch) | |
| tree | a0bb21b49530bc896dcd2c540a582e324c6d7785 /src/libsystemd/sd-bus/bus-control.c | |
| parent | 36afca67b67984520c5c9a6ce14af51a68c7c8cf (diff) | |
treewide: introduce UID_INVALID (and friends) as macro for (uid_t) -1
Diffstat (limited to 'src/libsystemd/sd-bus/bus-control.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 71fdbcf948..a9a0c1ec19 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -414,42 +414,42 @@ static int bus_populate_creds_from_items( case KDBUS_ITEM_CREDS: - if (mask & SD_BUS_CREDS_UID && (uid_t) item->creds.uid != (uid_t) -1) { + if (mask & SD_BUS_CREDS_UID && (uid_t) item->creds.uid != UID_INVALID) { c->uid = (uid_t) item->creds.uid; c->mask |= SD_BUS_CREDS_UID; } - if (mask & SD_BUS_CREDS_EUID && (uid_t) item->creds.euid != (uid_t) -1) { + if (mask & SD_BUS_CREDS_EUID && (uid_t) item->creds.euid != UID_INVALID) { c->euid = (uid_t) item->creds.euid; c->mask |= SD_BUS_CREDS_EUID; } - if (mask & SD_BUS_CREDS_SUID && (uid_t) item->creds.suid != (uid_t) -1) { + if (mask & SD_BUS_CREDS_SUID && (uid_t) item->creds.suid != UID_INVALID) { c->suid = (uid_t) item->creds.suid; c->mask |= SD_BUS_CREDS_SUID; } - if (mask & SD_BUS_CREDS_FSUID && (uid_t) item->creds.fsuid != (uid_t) -1) { + if (mask & SD_BUS_CREDS_FSUID && (uid_t) item->creds.fsuid != UID_INVALID) { c->fsuid = (uid_t) item->creds.fsuid; c->mask |= SD_BUS_CREDS_FSUID; } - if (mask & SD_BUS_CREDS_GID && (gid_t) item->creds.gid != (gid_t) -1) { + if (mask & SD_BUS_CREDS_GID && (gid_t) item->creds.gid != GID_INVALID) { c->gid = (gid_t) item->creds.gid; c->mask |= SD_BUS_CREDS_GID; } - if (mask & SD_BUS_CREDS_EGID && (gid_t) item->creds.egid != (gid_t) -1) { + if (mask & SD_BUS_CREDS_EGID && (gid_t) item->creds.egid != GID_INVALID) { c->egid = (gid_t) item->creds.egid; c->mask |= SD_BUS_CREDS_EGID; } - if (mask & SD_BUS_CREDS_SGID && (gid_t) item->creds.sgid != (gid_t) -1) { + if (mask & SD_BUS_CREDS_SGID && (gid_t) item->creds.sgid != GID_INVALID) { c->sgid = (gid_t) item->creds.sgid; c->mask |= SD_BUS_CREDS_SGID; } - if (mask & SD_BUS_CREDS_FSGID && (gid_t) item->creds.fsgid != (gid_t) -1) { + if (mask & SD_BUS_CREDS_FSGID && (gid_t) item->creds.fsgid != GID_INVALID) { c->fsgid = (gid_t) item->creds.fsgid; c->mask |= SD_BUS_CREDS_FSGID; } @@ -549,7 +549,7 @@ static int bus_populate_creds_from_items( c->mask |= SD_BUS_CREDS_AUDIT_SESSION_ID; } - if (mask & SD_BUS_CREDS_AUDIT_LOGIN_UID && (uid_t) item->audit.loginuid != (uid_t) -1) { + if (mask & SD_BUS_CREDS_AUDIT_LOGIN_UID && (uid_t) item->audit.loginuid != UID_INVALID) { c->audit_login_uid = (uid_t) item->audit.loginuid; c->mask |= SD_BUS_CREDS_AUDIT_LOGIN_UID; } @@ -946,12 +946,12 @@ static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds ** c->mask |= SD_BUS_CREDS_PID & mask; } - if (bus->ucred.uid != (uid_t) -1) { + if (bus->ucred.uid != UID_INVALID) { c->uid = bus->ucred.uid; c->mask |= SD_BUS_CREDS_UID & mask; } - if (bus->ucred.gid != (gid_t) -1) { + if (bus->ucred.gid != GID_INVALID) { c->gid = bus->ucred.gid; c->mask |= SD_BUS_CREDS_GID & mask; } |