picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: when passing resource limit values to client, map RLIM_INFINITY into portable value (uint64_t) -1

Browse source
This commit is contained in:
Lennart Poettering 2014-03-05 02:27:37 +01:00
parent 207017017d
commit a049d1a972
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/dbus-execute.c
View file

@ -87,6 +87,7 @@ static int property_get_rlimit(
struct rlimit *rl;
uint64_t u;
rlim_t x;
assert(bus);
assert(reply);
@ -94,7 +95,7 @@ static int property_get_rlimit(
rl = *(struct rlimit**) userdata;
if (rl)
u = (uint64_t) rl->rlim_max;
x = rl->rlim_max;
else {
struct rlimit buf = {};
int z;
@ -103,10 +104,14 @@ static int property_get_rlimit(
assert(z >= 0);
getrlimit(z, &buf);
u = (uint64_t) buf.rlim_max;
x = buf.rlim_max;
}
/* rlim_t might have different sizes, let's map
* RLIMIT_INFINITY to (uint64_t) -1, so that it is the same on
* all archs */
u = x == RLIM_INFINITY ? (uint64_t) -1 : (uint64_t) x;
return sd_bus_message_append(reply, "t", u);
}