From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 5 Mar 2014 01:27:37 +0000 (+0100)
Subject: core: when passing resource limit values to client, map RLIM_INFINITY into portable... 
X-Git-Tag: v211~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a049d1a9723b6608e45bf8f1a64dab5761dee555;p=elogind.git

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

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 3a05303f0..4c3ad6582 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -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);
 }