This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 7e96a3a Provide support for load-balancing to hosts that are all reachable over the same IP address, but different TCP/IP ports (e.g. docker instances or hosts behind a reverse NATed IPv4 gateway). This ended up in a rewrite of the complete selection_session() method of the base broker code. new ebf6c27 update some copyright years, make Josh Lukens copyright holder of https_get_authmechs.py new 214ddad On session resumption take profile's host list into account. Don't resume sessions the profile has not been configured for. (Fixes: #553). new a477c57 Update README and TODO. new 806224f Update copyright holders. Copyright is held only by people who actually contributed to the current code base. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 2 - README | 23 ++++++++-- TODO | 6 +-- bin/x2gobroker | 2 - bin/x2gobroker-daemon | 2 - bin/x2gobroker-testauth | 2 - debian/changelog | 5 +++ debian/copyright | 2 - doc/README.x2goclient+broker.getting-started | 4 +- etc/broker/x2gobroker-authservice-logger.conf | 2 - etc/broker/x2gobroker-loggers.conf | 2 - etc/x2gobroker.conf | 2 - init/x2gobroker-authservice.init | 4 +- init/x2gobroker-daemon.init | 2 +- lib/x2gobroker-agent.pl | 1 - sbin/x2gobroker-authservice | 2 - sbin/x2gobroker-daemon-debug | 2 - sbin/x2gobroker-keygen | 2 - sbin/x2gobroker-pubkeyauthorizer | 2 - sbin/x2gobroker-testagent | 2 - setup.py | 2 - src/x2gobroker-agent.c | 2 - src/x2gobroker-ssh.c | 2 - test.py | 2 +- x2gobroker/__init__.py | 1 - x2gobroker/_paramiko.py | 2 +- x2gobroker/agent.py | 2 - x2gobroker/authmechs/__init__.py | 1 - x2gobroker/authmechs/base_authmech.py | 1 - x2gobroker/authmechs/https_get_authmech.py | 4 +- x2gobroker/authmechs/none_authmech.py | 1 - x2gobroker/authmechs/pam_authmech.py | 1 - x2gobroker/authmechs/testsuite_authmech.py | 1 - x2gobroker/authservice.py | 2 - x2gobroker/basicauth.py | 2 - x2gobroker/brokers/base_broker.py | 52 ++++++++++++---------- x2gobroker/brokers/inifile_broker.py | 1 - x2gobroker/brokers/zeroconf_broker.py | 1 - x2gobroker/client/__init__.py | 1 - x2gobroker/client/plain.py | 2 - x2gobroker/config.py | 2 +- x2gobroker/defaults.py | 2 - x2gobroker/loggers.py | 2 - x2gobroker/nameservices/base_nameservice.py | 1 - x2gobroker/nameservices/libnss_nameservice.py | 1 - x2gobroker/nameservices/testsuite_nameservice.py | 1 - x2gobroker/optional_scripts/__init__.py | 2 +- x2gobroker/optional_scripts/base_script.py | 2 +- x2gobroker/uccsjson.py | 2 - x2gobroker/utils.py | 2 - x2gobroker/web/extras.py | 2 - x2gobroker/web/json.py | 2 - x2gobroker/web/plain.py | 2 - x2gobroker/web/uccs.py | 2 - x2gobroker/x2gobroker_exceptions.py | 1 - 55 files changed, 66 insertions(+), 114 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit ebf6c2742d43559282a86734bf8cd82d729ff550 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 11 23:33:13 2014 +0200 update some copyright years, make Josh Lukens copyright holder of https_get_authmechs.py --- x2gobroker/_paramiko.py | 2 +- x2gobroker/authmechs/https_get_authmech.py | 4 ++-- x2gobroker/config.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x2gobroker/_paramiko.py b/x2gobroker/_paramiko.py index b83cff3..acf89ca 100644 --- a/x2gobroker/_paramiko.py +++ b/x2gobroker/_paramiko.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/https_get_authmech.py b/x2gobroker/authmechs/https_get_authmech.py index 4f42d71..c5446fa 100644 --- a/x2gobroker/authmechs/https_get_authmech.py +++ b/x2gobroker/authmechs/https_get_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/config.py b/x2gobroker/config.py index 2715e1b..fc1fe60 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 214ddadd62b6d5ba0e6b2e9dbd38563bbbc9f233 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 11 23:59:47 2014 +0200 On session resumption take profile's host list into account. Don't resume sessions the profile has not been configured for. (Fixes: #553). --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 50 +++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f207a1..cfe0cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -199,6 +199,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Fix typos and host/port mixups in the remote_sshproxy logic. (Fixes: #544). - Make sure find_busy_servers in agent.py returns a tuple (recent API change) to not break profiles with multiple servers. (Fixes: #545). + - On session resumption take profile's host list into account. Don't resume + sessions the profile has not been configured for. (Fixes: #553). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index b72576d..ea48f77 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1092,28 +1092,34 @@ class X2GoBroker(object): running_sessions = [] suspended_sessions = [] for session_info in session_list: - if session_info.split('|')[4] == 'R': - running_sessions.append(session_info) - if session_info.split('|')[4] == 'S': - suspended_sessions.append(session_info) - - # we prefer suspended sessions over resuming sessions if we find sessions with both - # states of activity - if suspended_sessions: - session_info = suspended_sessions[0] - elif running_sessions: - session_info = running_sessions[0] - x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], remote_agent=remote_agent) - # this is the turn-around in x2gocleansessions, so waiting as along as the daemon - # that will suspend the session - time.sleep(2) - session_info = session_info.replace('|R|', '|S|') - - # only use the server's official hostname (as set on the server) - # if we know about the real/physical address of the server - _session_server_name = session_info.split('|')[3] - if profile.has_key('host={server_name}'.format(server_name=_session_server_name)): - server_name = _session_server_name + session_host, session_domain = session_info.split('|')[3].split('.', 1) + if session_host in server_list: + if session_info.split('|')[4] == 'R': + running_sessions.append(session_info) + if session_info.split('|')[4] == 'S': + suspended_sessions.append(session_info) + + if suspended_sessions or running_sessions: + # we prefer suspended sessions over resuming sessions if we find sessions with both + # states of activity + if suspended_sessions: + session_info = suspended_sessions[0] + elif running_sessions: + session_info = running_sessions[0] + x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], remote_agent=remote_agent) + # this is the turn-around in x2gocleansessions, so waiting as along as the daemon + # that will suspend the session + time.sleep(2) + session_info = session_info.replace('|R|', '|S|') + + # only use the server's official hostname (as set on the server) + # if we have been provided with a physical server address. + # If no physical server address has been provided, we have to use + # the host address as found in server_list (and hope we can connect + # to that address. + _session_server_name = session_info.split('|')[3] + if profile.has_key('host={server_name}'.format(server_name=_session_server_name)): + server_name = _session_server_name except IndexError: # FIXME: if we get here, we have to deal with a broken session info -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit a477c57081caf242bbf6cb4c8bca17eb273743c8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 00:23:06 2014 +0200 Update README and TODO. --- README | 23 +++++++++++++++++++---- TODO | 6 +----- debian/changelog | 1 + doc/README.x2goclient+broker.getting-started | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/README b/README index a021cf5..2c2b709 100644 --- a/README +++ b/README @@ -7,10 +7,10 @@ session brokerage for X2Go via HTTP(S) and/or SSH. Dependencies: * This version of X2Go Session Broker requires X2Go Server - 4.1.0.0 and above. + 4.0.1.16 and above. * This version of X2Go Session Broker works with X2Go Client - (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0, not yet available) - as client. + (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0) + as a client. * Python modules: - python-setuptools (build-dependency) - python-argparse @@ -43,6 +43,21 @@ Available backends: It provides flexible provisioning of session profiles based on user, group and host ACLs. +Available authentication mechanisms: + + * NONE: Always authenticate every user never mind if password + is correct or not. + * PAM: Authenticate against the local PAM setup. The service + file /etc/pam.d/x2gobroker can be used to configure the + authentication. + * HTTPS_GET: Perform a http GET request against a web server. + If the web server returned code 200, authentication is + considered a success. + +Available nameservice backends: + + * LIBNSS: Obtain uses from the broker host's libnss configuration. + Configuration files: /etc/default/{x2gobroker-daemon,python-x2gobroker,x2gobroker-authservice} @@ -73,5 +88,5 @@ Environment variables (and their defaults): X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket light+love, -Mike Gabriel, 20130818 +Mike Gabriel, 20140912 diff --git a/TODO b/TODO index 930897c..fc3b525 100644 --- a/TODO +++ b/TODO @@ -13,10 +13,6 @@ For the INIFILE backend: o make use of X2Go::Server Perl API in x2gobroker-agent -For the communication with Python X2Go: - - o add a JSON based server/client protocol - light+love, -Mike Gabriel, 20130129 \ No newline at end of file +Mike Gabriel, 20140912 diff --git a/debian/changelog b/debian/changelog index cfe0cf4..87cfaaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low instances or hosts behind a reverse NATed IPv4 gateway). This ended up in a rewrite of the complete selection_session() method of the base broker code. + - Update README and TODO. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/doc/README.x2goclient+broker.getting-started b/doc/README.x2goclient+broker.getting-started index 3457e04..f5b471f 100644 --- a/doc/README.x2goclient+broker.getting-started +++ b/doc/README.x2goclient+broker.getting-started @@ -38,8 +38,8 @@ further by looking at this file: $ sudo editor /etc/pam.d/x2gobroker 5. -If you authenticate with the broker successfully, then you get offered two -session profiles named ,,KDE - localhost'' and ,,MATE - localhost''. These +If you have successfully authenticated against the broker, then you get offered +two session profiles named ,,KDE - localhost'' and ,,MATE - localhost''. These session profiles can be modified and customized in /etc/x2go/broker/x2gobroker-sessionprofiles.conf -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 806224f2caab8db9c7accb7fa4c5e587d34cd5ca Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 00:27:11 2014 +0200 Update copyright holders. Copyright is held only by people who actually contributed to the current code base. --- Makefile | 2 -- bin/x2gobroker | 2 -- bin/x2gobroker-daemon | 2 -- bin/x2gobroker-testauth | 2 -- debian/changelog | 2 ++ debian/copyright | 2 -- etc/broker/x2gobroker-authservice-logger.conf | 2 -- etc/broker/x2gobroker-loggers.conf | 2 -- etc/x2gobroker.conf | 2 -- init/x2gobroker-authservice.init | 4 ++-- init/x2gobroker-daemon.init | 2 +- lib/x2gobroker-agent.pl | 1 - sbin/x2gobroker-authservice | 2 -- sbin/x2gobroker-daemon-debug | 2 -- sbin/x2gobroker-keygen | 2 -- sbin/x2gobroker-pubkeyauthorizer | 2 -- sbin/x2gobroker-testagent | 2 -- setup.py | 2 -- src/x2gobroker-agent.c | 2 -- src/x2gobroker-ssh.c | 2 -- test.py | 2 +- x2gobroker/__init__.py | 1 - x2gobroker/agent.py | 2 -- x2gobroker/authmechs/__init__.py | 1 - x2gobroker/authmechs/base_authmech.py | 1 - x2gobroker/authmechs/none_authmech.py | 1 - x2gobroker/authmechs/pam_authmech.py | 1 - x2gobroker/authmechs/testsuite_authmech.py | 1 - x2gobroker/authservice.py | 2 -- x2gobroker/basicauth.py | 2 -- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/brokers/inifile_broker.py | 1 - x2gobroker/brokers/zeroconf_broker.py | 1 - x2gobroker/client/__init__.py | 1 - x2gobroker/client/plain.py | 2 -- x2gobroker/defaults.py | 2 -- x2gobroker/loggers.py | 2 -- x2gobroker/nameservices/base_nameservice.py | 1 - x2gobroker/nameservices/libnss_nameservice.py | 1 - x2gobroker/nameservices/testsuite_nameservice.py | 1 - x2gobroker/optional_scripts/__init__.py | 2 +- x2gobroker/optional_scripts/base_script.py | 2 +- x2gobroker/uccsjson.py | 2 -- x2gobroker/utils.py | 2 -- x2gobroker/web/extras.py | 2 -- x2gobroker/web/json.py | 2 -- x2gobroker/web/plain.py | 2 -- x2gobroker/web/uccs.py | 2 -- x2gobroker/x2gobroker_exceptions.py | 1 - 49 files changed, 9 insertions(+), 77 deletions(-) diff --git a/Makefile b/Makefile index b1dba91..37d4c9b 100755 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ #!/usr/bin/make -f # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker b/bin/x2gobroker index f9c878f..0080fbe 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker-daemon b/bin/x2gobroker-daemon index ca15948..2ea3ce3 100755 --- a/bin/x2gobroker-daemon +++ b/bin/x2gobroker-daemon @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index f7a1034..fd844d9 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/debian/changelog b/debian/changelog index 87cfaaa..999965b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -158,6 +158,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low up in a rewrite of the complete selection_session() method of the base broker code. - Update README and TODO. + - Update copyright holders. Copyright is held only by people who actually + contributed to the current code base. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/debian/copyright b/debian/copyright index fdf8b88..df887bd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,8 +8,6 @@ Source: http://code.x2go.org/releases/source/x2gobroker Files: * Copyright: 2012, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - 2012, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2012, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> License: AGPL-3+ Files: debian/* diff --git a/etc/broker/x2gobroker-authservice-logger.conf b/etc/broker/x2gobroker-authservice-logger.conf index 3c8c99f..3299769 100644 --- a/etc/broker/x2gobroker-authservice-logger.conf +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,6 +1,4 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index dd56a24..8fac596 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -1,6 +1,4 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index e6a2f30..b6ed8a8 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -1,6 +1,4 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init index 5f5e24a..074faa8 100755 --- a/init/x2gobroker-authservice.init +++ b/init/x2gobroker-authservice.init @@ -2,8 +2,8 @@ # # Start the X2Go Session Broker PAM Authentication Service # -# Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. +# Copyright © 2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO # Provides: x2gobroker-authservice diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index c8094fd..1e26dc5 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -3,7 +3,7 @@ # Start the X2Go Session Broker standalone daemon # # Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. +# Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO # Provides: x2gobroker-daemon diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index ec8ca58..d670895 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -2,7 +2,6 @@ # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index e29d84b..318c2f0 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index 3a82453..5a0da3c 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 9be0708..d839c5a 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 1995d95..6029792 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -2,8 +2,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index e927225..8dc527b 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/setup.py b/setup.py index cc9a703..e51112d 100755 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-M. Graesing <heint-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index 3337d3b..e281275 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -1,7 +1,5 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - * Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify diff --git a/src/x2gobroker-ssh.c b/src/x2gobroker-ssh.c index 81a4ecc..57af49f 100644 --- a/src/x2gobroker-ssh.c +++ b/src/x2gobroker-ssh.c @@ -1,7 +1,5 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - * Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> * Copyright (C) 2012-2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify diff --git a/test.py b/test.py index b04e9ee..0276f24 100755 --- a/test.py +++ b/test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index ea8e638..ec5fce9 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index ebca7d6..a253f94 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/__init__.py b/x2gobroker/authmechs/__init__.py index d3eff3c..e9d0a51 100644 --- a/x2gobroker/authmechs/__init__.py +++ b/x2gobroker/authmechs/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/base_authmech.py b/x2gobroker/authmechs/base_authmech.py index f8206af..2040ebf 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/base_authmech.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/none_authmech.py b/x2gobroker/authmechs/none_authmech.py index 6535f4b..0ce96ce 100644 --- a/x2gobroker/authmechs/none_authmech.py +++ b/x2gobroker/authmechs/none_authmech.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index 9e7b85b..4679e75 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/testsuite_authmech.py b/x2gobroker/authmechs/testsuite_authmech.py index 2df02c4..890a96d 100644 --- a/x2gobroker/authmechs/testsuite_authmech.py +++ b/x2gobroker/authmechs/testsuite_authmech.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index 7120fbc..457d898 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 0890ed9..6b33c75 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index ea48f77..928550b 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2012-2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index 18341bf..ca0dc44 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index 2e252ac..00b3fd7 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/client/__init__.py b/x2gobroker/client/__init__.py index d3eff3c..e9d0a51 100644 --- a/x2gobroker/client/__init__.py +++ b/x2gobroker/client/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index d10ae3e..2cf39d6 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index e4d95ac..9451d4b 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index edaaabe..c4b77df 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/base_nameservice.py b/x2gobroker/nameservices/base_nameservice.py index d4c042d..33e7e1a 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index a864e81..8889d87 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index a7e3a68..4dd79f3 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/optional_scripts/__init__.py b/x2gobroker/optional_scripts/__init__.py index d3eff3c..5bf61f0 100755 --- a/x2gobroker/optional_scripts/__init__.py +++ b/x2gobroker/optional_scripts/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/optional_scripts/base_script.py b/x2gobroker/optional_scripts/base_script.py index dd9e5e2..f9ac33f 100755 --- a/x2gobroker/optional_scripts/base_script.py +++ b/x2gobroker/optional_scripts/base_script.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 726b52d..17ee82c 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py index f296b03..bcb9e2a 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index 4c5afcb..b90f936 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 02f4846..298082d 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index be4a81d..9ed7b52 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 87dc64a..fa182eb 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2014 by Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 5212e20..7a5a6c1 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2014 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org