[X2Go-Commits] [x2gobroker] 01/01: Only drop privileges if x2gobroker(-daemon) is run as uidNumber 0.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 3 12:37:24 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit cd59c720840b728816a932f2b2bfd7844111cee2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 3 12:37:04 2014 +0100

    Only drop privileges if x2gobroker(-daemon) is run as uidNumber 0.
---
 bin/x2gobroker   |    2 +-
 debian/changelog |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/x2gobroker b/bin/x2gobroker
index a8ef7ab..b94443c 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -165,7 +165,7 @@ if __name__ == "__main__":
 
     cmdline_args = p.parse_args()
 
-    if cmdline_args.drop_privileges:
+    if os.getuid() == 0 and cmdline_args.drop_privileges:
         drop_privileges()
 
     if cmdline_args.config_file is not None:
diff --git a/debian/changelog b/debian/changelog
index b0e6113..349c880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,7 +87,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Provide systemd service files for x2gobroker-daemon and
       x2gobroker-authservice.
     - Add --drop-privileges feature so that x2gobroker-daemon can drop root
-      privileges when started via systemd.
+      privileges when started via systemd. Only drop privileges if
+      x2gobroker(-daemon) is run as uidNumber 0.
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Fix SYNOPSIS texts.

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git



More information about the x2go-commits mailing list