From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 30 Jun 2014 17:08:48 +0000 (-0400)
Subject: Cast to gid_t to fix android build failure
X-Git-Tag: lxc-1.1.0.alpha1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4c1e35d24b3f6d810c4d01230ad668e9418dc2d;p=thirdparty%2Flxc.git

Cast to gid_t to fix android build failure

stat.st_gid is unsigned long in bionic instead of the expected gid_t, so
just cast it to gid_t.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 70f57afe0..dd92daeb5 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3602,8 +3602,8 @@ int chown_mapped_root(char *path, struct lxc_conf *conf)
 		}
 
 		// "g:pathgid:rootgid+pathgid:1"
-		ret = snprintf(map4, 100, "g:%d:%d:1", sb.st_gid,
-				rootgid + sb.st_gid);
+		ret = snprintf(map4, 100, "g:%d:%d:1", (gid_t)sb.st_gid,
+				rootgid + (gid_t)sb.st_gid);
 		if (ret < 0 || ret >= 100) {
 			ERROR("Error gid printing map string");
 			return -1;
@@ -3617,7 +3617,7 @@ int chown_mapped_root(char *path, struct lxc_conf *conf)
 		}
 
 		// "0:pathgid" (chown)
-		ret = snprintf(ugid, 100, "0:%d", sb.st_gid);
+		ret = snprintf(ugid, 100, "0:%d", (gid_t)sb.st_gid);
 		if (ret < 0 || ret >= 100) {
 			ERROR("Error owner printing format string for chown");
 			return -1;