From: Masayuki Igawa <igawa@mxs.nes.nec.co.jp>
Date: Thu, 14 May 2009 05:14:35 +0000 (+0530)
Subject: There is the problem that cgrulesengd cannot get Gid from /proc/PID/status,
X-Git-Tag: v0.34~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3bf34c067b1317b65ba5496cd716e4a554dec1;p=thirdparty%2Flibcgroup.git

There is the problem that cgrulesengd cannot get Gid from /proc/PID/status,
because the function breaks just after getting Uid data:

 $ cat /proc/$$/status
 [snip]
 Uid:    500     500     500     500
 Gid:    500     500     500     500
 [snip]
 $

This patch fixes this problem.

Signed-off-by: Masayuki Igawa <igawa@mxs.nes.nec.co.jp>
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 07d4a5de..595c3215 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -168,11 +168,9 @@ static int cgre_get_euid_egid_from_status(pid_t pid, uid_t *euid, gid_t *egid)
 		if (!strncmp(buf, "Uid:", 4)) {
 			sscanf((buf + 5), "%d%d%d%d", &ruid, euid,
 				&suid, &fsuid);
-			break;
 		} else if (!strncmp(buf, "Gid:", 4)) {
 			sscanf((buf + 5), "%d%d%d%d", &rgid, egid,
 				&sgid, &fsgid);
-			break;
 		}
 		memset(buf, '\0', sizeof(buf));
 	}