02851a1
--- xen-4.1.2/tools/python/xen/xend/server/SrvDaemon.py.orig	2012-04-15 17:17:50.167887550 +0100
02851a1
+++ xen-4.1.2/tools/python/xen/xend/server/SrvDaemon.py	2012-04-15 17:31:13.648842655 +0100
02851a1
@@ -325,7 +325,8 @@
02851a1
     def set_user(self):
02851a1
         # Set the UID.
02851a1
         try:
02851a1
-            os.setuid(pwd.getpwnam(XEND_USER)[2])
02851a1
+            if XEND_USER != "root":
02851a1
+                os.setuid(pwd.getpwnam(XEND_USER)[2])
02851a1
             return 0
02851a1
         except KeyError:
02851a1
             print >>sys.stderr, "Error: no such user '%s'" % XEND_USER
e1a5934
--- xen-4.4.0/tools/python/xen/xend/xend.orig	2012-08-07 00:54:02.372867624 +0100
e1a5934
+++ xen-4.4.0/tools/python/xen/xend/xend	2012-08-07 00:58:11.469753483 +0100
32a9cc9
@@ -1,4 +1,4 @@
32a9cc9
-#!/usr/bin/env python
76997c6
+#!/usr/bin/python -Es
32a9cc9
 #  -*- mode: python; -*-
32a9cc9
 #============================================================================
32a9cc9
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>