chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: fix bogus warning about dropping 20 bytes from multi-part messages
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-message.c
diff --git
a/src/libsystemd/sd-bus/bus-message.c
b/src/libsystemd/sd-bus/bus-message.c
index 05015a4157cd80044b5dd6d3244e5e2513773248..ec3a39d051c82629ed3d945c5965204d13d098d3 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-message.c
+++ b/
src/libsystemd/sd-bus/bus-message.c
@@
-429,10
+429,10
@@
int bus_message_from_header(
if (m->creds.pid > 0)
m->creds.mask |= SD_BUS_CREDS_PID;
if (m->creds.pid > 0)
m->creds.mask |= SD_BUS_CREDS_PID;
- if (m->creds.uid !=
(uid_t) -1
)
+ if (m->creds.uid !=
UID_INVALID
)
m->creds.mask |= SD_BUS_CREDS_UID;
m->creds.mask |= SD_BUS_CREDS_UID;
- if (m->creds.gid !=
(gid_t) -1
)
+ if (m->creds.gid !=
GID_INVALID
)
m->creds.mask |= SD_BUS_CREDS_GID;
}
m->creds.mask |= SD_BUS_CREDS_GID;
}
@@
-2063,6
+2063,7
@@
static int bus_message_close_variant(sd_bus_message *m, struct bus_container *c)
assert(m);
assert(c);
assert(m);
assert(c);
+ assert(c->signature);
if (!BUS_MESSAGE_IS_GVARIANT(m))
return 0;
if (!BUS_MESSAGE_IS_GVARIANT(m))
return 0;