From: Michel Normand <normand@fr.ibm.com>
Date: Wed, 7 Oct 2009 14:06:08 +0000 (+0200)
Subject: accept commands from root
X-Git-Tag: lxc_0_6_4~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8cc9804aefe14783a40b59694e3f57ecf6643ff;p=thirdparty%2Flxc.git

accept commands from root

Commands should be accepted when they are coming from root.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Michel Normand <normand@fr.ibm.com>
---

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index ad3e94ca8..cf4d81611 100644
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -237,9 +237,9 @@ int lxc_af_unix_rcv_credential(int fd, void *data, size_t size)
             cmsg->cmsg_level == SOL_SOCKET &&
             cmsg->cmsg_type == SCM_CREDENTIALS) {
                 cred = *((struct ucred *) CMSG_DATA(cmsg));
-		if (cred.uid != getuid() || cred.gid != getgid()) {
+		if (cred.uid && (cred.uid != getuid() || cred.gid != getgid())) {
 			INFO("message denied for '%d/%d'", cred.uid, cred.gid);
-			return -EPERM;
+			return -EACCES;
 		}
         }
 out: