[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2golistdesktops: drop -u parameter to ss. Fixes: #799.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 1c4412d1e7a07e30be74cd8f71eaafacabb999e8
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Nov 10 16:40:36 2016 +0100

    x2goserver/bin/x2golistdesktops: drop -u parameter to ss. Fixes: #799.
    
    We would filter out UDP sockets later anyway and the combination -lxu is
    known to be broken with some versions of iproute2.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog                |    6 ++++++
 x2goserver/bin/x2golistdesktops |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 83053ed..1fae270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -380,6 +380,12 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
     - x2goserver/bin/x2goruncommand: capture x2goruncommand debug output for
       x2gofeature X2GO_XSESSION.
 
+  [ Orion Poplawski ]
+  * New upstream version (4.0.1.20):
+    - x2goserver/bin/x2golistdesktops: drop -u parameter to ss. Fixes: #799.
+      We would filter out UDP sockets later anyway and the combination -lxu is
+      known to be broken with some versions of iproute2.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 24 Feb 2015 22:11:49 +0100
 
 x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 386ed17..1cbc7ef 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -66,7 +66,7 @@ my $uname=$ENV{'USER'};
 # -> so we need to tweak the PATH env var a little here...
 my $old_PATH=$ENV{'PATH'};
 $ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin";
-my $lines=system_capture_stdout_output("ss", "-lxu");
+my $lines=system_capture_stdout_output("ss", "-lx");
 $ENV{'PATH'}=$old_PATH;
 undef $old_PATH;
 

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