Date: Fri, 29 Apr 2016 15:46:29 +0200
From: Arne Wichmann <aw@anhrefn.saar.de>
To: submit@bugs.x2go.org
Subject: x2goserver stops accepting new sessions after some years of working
Message-ID: <20160429134629.GB17740@anhrefn.saar.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="uZ3hkaAS1mZxFaxD"
Content-Disposition: inline
Return-Receipt-To: aw@anhrefn.saar.de
User-Agent: Mutt/1.5.23 (2014-03-12)


--uZ3hkaAS1mZxFaxD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Package: x2goserver
Version: 3.0.99-3
Tags: patch

After some years of working x2goserver stopped accepting sessions - after
some debugging it turned out that the list of used ports in the database
was never cleaned up.

--- /usr/sbin/x2gocleansessions 2016-01-18 12:45:22.794498999 +0100
+++ /usr/sbin/x2gocleansessions.151214  2015-12-14 16:26:55.979026003 +0100
@@ -2,10 +2,6 @@
 use Sys::Hostname;
 use strict;
=20
-use lib "/usr/lib/x2go";
-use x2godbwrapper;=20
-
-
 sub check_pid
 {
    my $pid=3Dshift;
@@ -105,6 +101,5 @@
        }=20=20=20=20=20=20=20
      }
   }
-  db_cleanports() or warn "cleanports failed";
  }
 }
--- /usr/lib/x2go/x2godbwrapper.pm      2016-01-18 12:05:26.544499000 +0100
+++ /usr/lib/x2go/x2godbwrapper.pm.151214       2015-12-14 16:25:17.7590260=
03 +0100
@@ -59,12 +59,10 @@
=20
 use base 'Exporter';
=20
-our @EXPORT=3D('db_listsessions','db_listsessions_all', 'db_getservers',
-  'db_getagent', 'db_resume', 'db_changestatus', 'db_getdisplays',
-  'db_insertsession', 'db_getports', 'db_insertport', 'db_createsession',
-  'db_insertmount', 'db_getmounts', 'db_deletemount', 'db_getdisplay',
-  'dbsys_getmounts', 'dbsys_listsessionsroot', 'dbsys_listsessionsroot_all=
',
-  'dbsys_rmsessionsroot', 'db_cleanports');
+our @EXPORT=3D('db_listsessions','db_listsessions_all', 'db_getservers', '=
db_getagent', 'db_resume', 'db_changestatus',=20
+            'db_getdisplays', 'db_insertsession', 'db_getports', 'db_inser=
tport', 'db_createsession', 'db_insertmount',=20
+            'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getm=
ounts', 'dbsys_listsessionsroot',=20
+            'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot');
=20
=20=20=20=20=20=20=20=20=20=20=20=20=20
=20=20=20=20=20=20=20=20=20=20=20=20=20
@@ -409,15 +407,7 @@
        {
           return split("\n",`sudo -u x2gouser x2gosqlitewrapper getports $=
server`);
        }
-}
=20
-# throw away all ports for which no matching session exists
-sub db_cleanports {
-  if($backend eq 'postgres') {
-    my $dbh=3DDBI->connect("dbi:Pg:dbname=3D$db;host=3D$host;port=3D$port;=
", "$dbuser", "$dbpass",{AutoCommit =3D> 1}) or die $_;
-    my $sth=3D$dbh->prepare("delete from used_ports where port in (select =
port from used_ports natural left join sessions  where status is null)");
-    $sth->execute()or die;
-  } else { die "not implemented - possibly not needed"; }
 }
=20
 sub db_getservers


--=20
[...] If you don't want to be restricted, don't agree to it. If you are
coerced, comply as much as you must to protect yourself, just don't support
it. Noone can free you but yourself. (crag, on Debian Planet)
Arne Wichmann (aw@saar.de)

--uZ3hkaAS1mZxFaxD
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJXI2WvAAoJEENYfBy4DUs+ijAP/imL35p0voLfYXClaTDJUr1l
h8uIGKuQg+10wiz5wTt2FuRAJFz7uIDplJTpdc2mOtAv7N2o1r0UPmIGN4kFGLkU
heTUvmA1rW0slWK6s0l7grgfdCsAFjn2cxRQXhIrCZENLZr16il7I+1Fovmf/X/V
lv+fxZCYO8Pa77uPji82UfNLtRCoWE7LvY8W1GH2bYDk1v7xOxCTBmoEl6nwkmjR
Lbncu5GltFWNDg9fqQiirmSS/1iW8eQugxdpBUGxDusb9pfRzTLL8FwK4a9f13nu
aPPRk9kwoQ5lTgxnERdFTjza+sm0PvYH9hFL6feq5Px+EwxvC80S2SnAQg6mJ8Wx
iyYlV+Lrwrx5b9Ct6Arue0iVwP/igzIuUDDGYxXihwuMO8pAftXWtes/WZ0wunMi
Ic6yP5a6UOxdLv4Vz03iZoVRDJc51R+x07riJCSIpkth1RNsUCkW6GDn/bcy63K4
gKkuTTXlvxkSbpJgNEsuO+gpNqgkhd3Lyp87xAl/z+TjwELpx1Ahdtf74J/JkfDe
yOsKjL30BaDQzHSAjxvjYh38CHJAKlUpgiuPfOXQcuWFN61k7afZdkCUE12aVV4K
R0yv2zztpUrs+NROpMY5KnZ8pYrJkNz3uGYh+bYPB+4z/aT4fntaAyI/D8wWkbgk
EfWUpGQ0sSeyC1WyW/H7
=Zp7q
-----END PGP SIGNATURE-----

--uZ3hkaAS1mZxFaxD--