From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Fri, 23 Jul 2010 13:10:38 +0000 (+0200)
Subject: fix setuid to attach, create and start
X-Git-Tag: lxc-0.7.2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc456e995fafae7267e993cb06e54913b76d0a13;p=thirdparty%2Flxc.git

fix setuid to attach, create and start

Fix the setuid bit root script.

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

diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
index 23829eecd..cc719b584 100644
--- a/src/lxc/lxc-setcap.in
+++ b/src/lxc/lxc-setcap.in
@@ -60,6 +60,7 @@ lxc_setcaps()
 
 lxc_dropcaps()
 {
+    setcap -r @BINDIR@/lxc-attach
     setcap -r @BINDIR@/lxc-create
     setcap -r @BINDIR@/lxc-execute
     setcap -r @BINDIR@/lxc-start
diff --git a/src/lxc/lxc-setuid.in b/src/lxc/lxc-setuid.in
index d65ef1e5d..86d7d4a52 100644
--- a/src/lxc/lxc-setuid.in
+++ b/src/lxc/lxc-setuid.in
@@ -41,7 +41,10 @@ setuid()
 
 lxc_setuid()
 {
+    setuid @BINDIR@/lxc-attach
+    setuid @BINDIR@/lxc-create
     setuid @BINDIR@/lxc-execute
+    setuid @BINDIR@/lxc-start
     setuid @BINDIR@/lxc-restart
     setuid @BINDIR@/lxc-unshare
     setuid @BINDIR@/lxc-netstat
@@ -54,12 +57,16 @@ lxc_setuid()
 
 lxc_dropuid()
 {
+    setuid -r @BINDIR@/lxc-attach
+    setuid -r @BINDIR@/lxc-create
     setuid -r @BINDIR@/lxc-execute
+    setuid -r @BINDIR@/lxc-start
     setuid -r @BINDIR@/lxc-restart
     setuid -r @BINDIR@/lxc-unshare
     setuid -r @BINDIR@/lxc-netstat
     setuid -r @BINDIR@/lxc-checkpoint
     setuid -r @LXCINITDIR@/lxc-init
+
     chmod 0755 @LXCPATH@
 }