[X2Go-Commits] x2gobroker.git - master (branch) updated:

X2Go dev team git-admin at x2go.org
Wed Oct 23 22:04:00 CEST 2013

The branch, master has been updated
       via  2bca21cc7a4bb982f5b37149673a43bf150a0e7e (commit)
      from  11a95dee05bb6ebad3da423eea72323ec4d65051 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2bca21cc7a4bb982f5b37149673a43bf150a0e7e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 10 12:05:50 2013 +0200

    drop duplicate code


Summary of changes:
 bin/x2gobroker |   10 ----------
 1 file changed, 10 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index b23f1ad..9688442 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -169,16 +169,6 @@ logger_broker.info('  X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobrok
 logger_broker.info('  X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE))
 logger_broker.info('  X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE))
-interactive_mode_warning = False
-# check effective UID the broker runs as and complain appropriately...
-if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0:
-    interactive_mode_warning = True
-elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0:
-    logger_broker.warn('X2Go Session Broker should not be run as root,')
-    logger_broker.warn('  better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
-elif os.geteuid() == 0:
-    logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user')
 # run the web.py standalone daemon...
 if __name__ == "__main__":

x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

More information about the x2go-commits mailing list