[pkg-remote-commits] [x2goserver] 05/06: debian/patches: Update 1002_backport-x2golistshadowsessions.patch. Add missing function exports and missing helper function.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository x2goserver.

commit bd3159f26b80ddfcf0abc5f1374c6282d4b0e231
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 26 01:42:19 2017 +0200

    debian/patches: Update 1002_backport-x2golistshadowsessions.patch. Add missing function exports and missing helper function.
---
 .../1002_backport-x2golistshadowsessions.patch     | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/patches/1002_backport-x2golistshadowsessions.patch b/debian/patches/1002_backport-x2golistshadowsessions.patch
index 29797e8..ffdefa3 100644
--- a/debian/patches/1002_backport-x2golistshadowsessions.patch
+++ b/debian/patches/1002_backport-x2golistshadowsessions.patch
@@ -4,7 +4,7 @@ Comment:
 
 --- /dev/null
 +++ b/x2goserver/bin/x2golistshadowsessions
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,97 @@
 +#!/usr/bin/perl
 +
 +# Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org
@@ -47,6 +47,16 @@ Comment:
 +	syslog('debug', "x2golistshadowsessions has been called with no option");
 +}
 +
++sub is_suspended
++{
++	my $state=get_agent_state(@_);
++	if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
++	{
++		return 1;
++	}
++	return 0;
++}
++
 +
 +my $serv=shift;
 +if( ! $serv)
@@ -79,7 +89,7 @@ Comment:
 +		{
 +			my $shadow_user = @sinfo[1];
 +			$shadow_user =~ s/.*XSHAD(.*)XSHADPP.*/$1/;
-+			if(session_is_suspended(@sinfo[1], $shadow_user))
++			if(is_suspended(@sinfo[1], $shadow_user))
 +			{
 +				db_changestatus( 'S', @sinfo[1] );
 +				@outp[$i] =~ s/\|R\|/\|S\|/;
@@ -162,7 +172,17 @@ Comment:
  	*) exit -1;;
 --- a/x2goserver/lib/x2godbwrapper.pm
 +++ b/x2goserver/lib/x2godbwrapper.pm
-@@ -674,3 +674,63 @@
+@@ -88,7 +88,8 @@
+ our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', 'db_getstatus', 
+              'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_rmport', 'db_createsession', 'db_insertmount', 
+              'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', 
+-             'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts');
++             'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot', 'dbsys_deletemounts',
++             'db_listshadowsessions', 'db_listshadowsessions_all');
+ 
+ sub dbsys_rmsessionsroot
+ {
+@@ -674,3 +675,63 @@
  		return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`);
  	}
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goserver.git