From: Sapan Bhatia <gwsapan@gmail.com>
Date: Wed, 26 Mar 2014 14:14:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
X-Git-Tag: lxc-userspace-1.0-10~1
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=bd37a163c0812d0d6751b4876dbfb7b231a8dc75;hp=e060cdb530ba984703d56872672d1ec148291031

Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
---

diff --git a/lxc-userspace.spec b/lxc-userspace.spec
index c38e385..d23cac0 100644
--- a/lxc-userspace.spec
+++ b/lxc-userspace.spec
@@ -1,6 +1,6 @@
 %define name lxc-userspace
 %define version 1.0
-%define taglevel 8
+%define taglevel 9
 
 %define percent %
 %define braop \{
@@ -55,6 +55,12 @@ chmod u+s /usr/sbin/vsh
 %postun
 
 %changelog
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - lxc-userspace-1.0-9
+- does not rely on capsh (actually this was the one in the sliver)
+- use native capability dropping instead
+- provides new slicesu binary
+- suitable for libvirt-1.1 and above
+
 * Fri Sep 20 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - lxc-userspace-1.0-8
 - fix vsh permissions
 
diff --git a/lxcsu b/lxcsu
index 4c4bc04..b05342a 100755
--- a/lxcsu
+++ b/lxcsu
@@ -3,7 +3,7 @@
 import sys
 import os
 import setns
-import pdb
+import pwd
 
 from argparse import ArgumentParser
 
@@ -79,6 +79,24 @@ def main ():
     args = parser.parse_args()
     slice_name=args.slice_name
 
+    # support for either setting debug at the top of this file, or on the command-line
+    if args.debug:
+        global debug
+	debug=True
+
+    # somehow some older nodes won't be able to find the login name in /etc/passwd 
+    # when this is done down the road, so compute slice_uid while in a safe env
+    # even though we don't use the slice_uid any more, this is still 
+    # checked later on as a means to ensure existence of the slice account
+    try:
+        slice_uid = pwd.getpwnam(slice_name).pw_uid
+    except Exception, e:
+        if debug:
+            import traceback
+            print 'error while computing slice_uid',e
+            traceback.print_exc()
+        slice_uid=None
+
     # unless we run the symlink 'lxcsu-internal', or we specify the -i option, prepend '--' '-c'
     if sys.argv[0].find('internal')>=0: args.internal=True
 
@@ -93,11 +111,6 @@ def main ():
 	if not args.command_to_run: args.command_to_run=['/bin/sh']
 	args.command_to_run = [ '-c' ] + [" ".join(args.command_to_run)]
 
-    # support for either setting debug at the top of this file, or on the command-line
-    if args.debug:
-        global debug
-	debug=True
-
     try:
         cmd = '/usr/bin/virsh --connect lxc:/// domid %s'%slice_name
         # convert to int as a minimal raincheck
@@ -230,13 +243,6 @@ def main ():
 
     fork_pid = os.fork()
 
-    def getuid (slicename):
-        import pwd
-        try:
-            return pwd.getpwnam(slicename).pw_uid
-        except:
-            return
-
     if (fork_pid == 0):
         if (not args.root):
             setns.drop_caps() 
@@ -244,10 +250,7 @@ def main ():
                 # we still want to drop capabilities, but don't want to switch UIDs
                 exec_args = [arch,'/bin/sh','--login',]+args.command_to_run
             else:
-				# let's keep this check even though we don't use the uid
-				# as a way of checking the existence of the slice account
-                uid = getuid (slice_name)
-                if not uid:
+                if not slice_uid:
                     print "lxcsu could not spot %s in /etc/passwd - exiting"%slice_name
                     exit(1)
                 exec_args = [arch,'/usr/bin/sudo','-u',slice_name,'/bin/sh','--login',]+args.command_to_run