[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-230-g1181697

[X2Go dev team]

The branch, master has been updated
       via  1181697b8fe1ae9b38b172e03fdbcd566c579c51 (commit)
      from  40c674c9e82c6217c5422aae2d86974c5949b716 (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 1181697b8fe1ae9b38b172e03fdbcd566c579c51
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 13 12:44:24 2013 +0100

    Do not superenice desktop sharing / shadow sessions.

-----------------------------------------------------------------------

Summary of changes:
 X2Go/SupeReNicer.pm             |    6 +++---
 debian/changelog                |    1 +
 x2goserver/bin/x2golistdesktops |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/X2Go/SupeReNicer.pm b/X2Go/SupeReNicer.pm
index 0a9fda2..6279fa9 100644
--- a/X2Go/SupeReNicer.pm
+++ b/X2Go/SupeReNicer.pm
@@ -99,7 +99,7 @@ sub superenice {
 			my $line = clups($_);
 			my ($agentPid,$x2gosid,undef,undef,$x2goState,undef,undef,undef,undef,undef,undef,$userID,undef,undef) = split(/\|/,$line);
 			#syslog('debug', "$agentPid,$x2gosid,$x2goState,$userID");
-			unless ($ignore{$userID} eq 1) {
+			unless (($ignore{$userID} eq 1) || ($x2gosid =~ m/.*XSHAD.*XSHAD/)) {
 				push @x2goSessions, "$x2goState:$agentPid:$x2gosid:$userID";
 			}
 		}
@@ -178,7 +178,7 @@ sub superenice {
 			syslog('debug', "$agentPid,$x2gosid,,$x2goState,$userID");
 
 			# If user is in ignore list... we're not going a damn thing..
-			unless ($ignore{$userID} eq 1) {
+			unless (($ignore{$userID} eq 1) || ($x2gosid =~ m/.*XSHAD.*XSHAD/)) {
 				unless ($niceUsers{$userID} =~ /^R:/) {   # Basically if we got an R we're sticking with it...
 					$niceUsers{$userID} = "$x2goState:$agentPid";
 				}
@@ -223,4 +223,4 @@ sub superenice {
 	}
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 9cc828d..e2a7985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
       names of desktop sharing session start with the username of the user who
       is requesting the desktop sharing, rather than the username of the person
       who shares his/her desktop.
+    - Do not superenice desktop sharing / shadow sessions.
   * /debian/control:
     + Package X2Go::Log in separate package: libx2go-log-perl.
     + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 65ecfa1..b489286 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -87,4 +87,4 @@ for(my $i=0;$i<@outp;$i++)
 }
 
 # closing syslog 
-closelog;
\ No newline at end of file
+closelog;


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).