[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-120-gb053c03

X2go dev team git-admin at x2go.org
Mon Jul 25 19:38:55 CEST 2011


The branch, master has been updated
       via  b053c030b22066f5a712e2c4dd25c0be0f7dc256 (commit)
       via  c7f36ada87546eed646b8a8c0805eb774a7262cd (commit)
      from  08d995e53db7f7d8acc142aa1258b44078c281f5 (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 b053c030b22066f5a712e2c4dd25c0be0f7dc256
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jul 25 00:07:53 2011 +0200

    Allow users to edit their *own* sessions only
    
    previously, users could create sessions under wrong uids or delete
    sessions from other users. This patch implements prevents this by
    checking the userid of the caller with the session id.

commit c7f36ada87546eed646b8a8c0805eb774a7262cd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jul 25 19:38:17 2011 +0200

    Remove files that get cleaned by the Makefile

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

Summary of changes:
 .../html/man8/x2gosetkeyboard.8.html               |   61 -----------------
 .../.build_man2html/html/man8/x2goversion.8.html   |   69 --------------------
 .../html/man8/x2gocleansessions.8.html             |   49 --------------
 .../html/man8/x2gocmdexitmessage.8.html            |   49 --------------
 .../html/man8/x2golistdesktops.8.html              |   49 --------------
 .../html/man8/x2golistsessions.8.html              |   49 --------------
 .../.build_man2html/html/man8/x2gomountdirs.8.html |   49 --------------
 .../.build_man2html/html/man8/x2goprint.8.html     |   49 --------------
 .../html/man8/x2goresume-session.8.html            |   49 --------------
 .../html/man8/x2goruncommand.8.html                |   49 --------------
 .../html/man8/x2goshowblocks.8.html                |   49 --------------
 .../html/man8/x2gostartagent.8.html                |   65 ------------------
 .../html/man8/x2gosuspend-session.8.html           |   49 --------------
 .../html/man8/x2goterminate-session.8.html         |   49 --------------
 .../html/man8/x2goumount-session.8.html            |   49 --------------
 x2goserver/lib/x2gosqlitewrapper.pl                |   23 ++++++-
 16 files changed, 20 insertions(+), 786 deletions(-)
 delete mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
 delete mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goprint.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
 delete mode 100644 x2goserver/.build_man2html/html/man8/x2goumount-session.8.html

The diff of changes is:
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
deleted file mode 100644
index ced3e23..0000000
--- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ /dev/null
@@ -1,61 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE>
-</HEAD><BODY>
-<H1>x2gosetkeyboard</H1>
-Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2gosetkeyboard
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
-<P>
-
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
-will be raised).
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
deleted file mode 100644
index 0a994e2..0000000
--- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
+++ /dev/null
@@ -1,69 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goversion</TITLE>
-</HEAD><BODY>
-<H1>x2goversion</H1>
-Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goversion - Retrieve Code Versions of X2go Server Components
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goversion [<x2go-component>]
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goversion</B> allows to retrieve code versions of X2go server components.
-<P>
-
-If the
-<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server
-component names and versions is listed.
-<P>
-
-If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the
-component's version is printed to stdout.
-<P>
-
-The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions
-of X2go components.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-/usr/share/x2go/versions/VERSION.*
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
deleted file mode 100644
index bbc70af..0000000
--- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gocleansessions</TITLE>
-</HEAD><BODY>
-<H1>x2gocleansessions</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gocleansessions - X2go Server Cleanup Daemon
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2gocleansessions
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gocleansessions</B> is run as a service on X2go servers to handle the cleanup of stale sessions.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
deleted file mode 100644
index 4daa752..0000000
--- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gocmdexitmessage</TITLE>
-</HEAD><BODY>
-<H1>x2gocmdexitmessage</H1>
-Section: X2go Server Tool (8)<BR>Updated: July 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goexitmessage - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goexitmessage
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goexitmessage</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
deleted file mode 100644
index c2b2183..0000000
--- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2golistdesktops</TITLE>
-</HEAD><BODY>
-<H1>x2golistdesktops</H1>
-Section: X2go Server Tool (8)<BR>Updated: July 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2golistdesktops - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2golistdesktops
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2golistdesktops</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
deleted file mode 100644
index 2c30dce..0000000
--- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2golistsessions</TITLE>
-</HEAD><BODY>
-<H1>x2golistsessions</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2golistsessions - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2golistsessions
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2golistsessions</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
deleted file mode 100644
index e190c1b..0000000
--- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gomountdirs</TITLE>
-</HEAD><BODY>
-<H1>x2gomountdirs</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gomountdirs - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2gomountdirs
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gomountdirs</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
deleted file mode 100644
index f169cc5..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goprint</TITLE>
-</HEAD><BODY>
-<H1>x2goprint</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goprint - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goprint
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goprint</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
deleted file mode 100644
index b14a690..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goresume-session</TITLE>
-</HEAD><BODY>
-<H1>x2goresume-session</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goresume-session - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goresume-session
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goresume-session</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
deleted file mode 100644
index 6eed104..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goruncommand</TITLE>
-</HEAD><BODY>
-<H1>x2goruncommand</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goruncommand - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goruncommand
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goruncommand</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
deleted file mode 100644
index 6eed104..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goruncommand</TITLE>
-</HEAD><BODY>
-<H1>x2goruncommand</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goruncommand - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goruncommand
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goruncommand</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
deleted file mode 100644
index 392f103..0000000
--- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
+++ /dev/null
@@ -1,65 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gostartagent</TITLE>
-</HEAD><BODY>
-<H1>x2gostartagent</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gostartagent - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2gostartagent <geometry> <link-quality> <nx-pack-meth> <cache-type+dpi> <kblayout> <kbtype> <setkbd> <session-type> <command>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gostartagent</B> is a script that coordinates the startup process of new X2go sessions. 
-It expects quite a list of parameters, all of which are obligatory.
-<A NAME="lbAE"> </A>
-<H2>RETURN VALUES</H2>
-
-A list of parameters will be returned after a successful session startup. Each value will be presented on
-a new line:
-<P>
-<BR>    <B><X-display-number></B>
-<BR>    <B><session-cookie-hash></B>
-<BR>    <B><x2goagent-pid></B>
-<BR>    <B><session-name></B>
-<BR>    <B><graphics-port></B>
-<BR>    <B><sound-port></B>
-<BR>    <B><sshfs-port></B>
-<P>
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">RETURN VALUES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
deleted file mode 100644
index a605b8f..0000000
--- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gosuspend-session</TITLE>
-</HEAD><BODY>
-<H1>x2gosuspend-session</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gosuspend-session - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2gosuspend-session
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gosuspend-session</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
deleted file mode 100644
index b431107..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goterminate-session</TITLE>
-</HEAD><BODY>
-<H1>x2goterminate-session</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goterminate-session - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goterminate-session
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goterminate-session</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
deleted file mode 100644
index 4f37c92..0000000
--- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
+++ /dev/null
@@ -1,49 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goumount-session</TITLE>
-</HEAD><BODY>
-<H1>x2goumount-session</H1>
-Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goumount-session - X2go Server Script
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-x2goumount-session
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goumount-session</B> is one of many scripts belonging to X2go Server.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 21:20:41 GMT, July 18, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 70ee4e5..d598691 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -25,14 +25,14 @@ use strict;
 use DBI;
 use POSIX;
 
-# retrieve home dir of x2gouser 
+# retrieve home dir of x2gouser
 my $x2gouser='x2gouser';
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($x2gouser);
 my $dbfile="$homedir/x2go_sessions";
 
 # retrieve account data of real user
 my $realuser=$<;
-my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($realuser);
+my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($realuser);
 
 my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_;
 
@@ -81,6 +81,7 @@ elsif($cmd eq  "listsessionsroot_all")
 elsif($cmd eq  "getmounts")
 {
 	my $sid=shift or die "argument \"session_id\" missed";
+	check_user($sid);
 	my @strings;
 	my $sth=$dbh->prepare("select client, path from mounts where session_id=?");
 	$sth->execute($sid)or die;
@@ -91,6 +92,7 @@ elsif($cmd eq  "deletemount")
 {
 	my $sid=shift or die "argument \"session_id\" missed";
 	my $path=shift or die "argument \"path\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?");
 	$sth->execute($sid, $path);
 	$sth->finish();
@@ -101,6 +103,7 @@ elsif($cmd eq  "insertmount")
 	my $sid=shift or die "argument \"session_id\" missed";
 	my $path=shift or die "argument \"path\" missed";
 	my $client=shift or die "argument \"client\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values  (?, ?, ?)");
 	$sth->execute($sid, $path, $client);
 	if(!$sth->err())
@@ -115,6 +118,7 @@ elsif($cmd eq  "insertsession")
 	my $display=shift or die "argument \"display\" missed";
 	my $server=shift or die "argument \"server\" missed";
 	my $sid=shift or die "argument \"session_id\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values
 	                       (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))");
 	$sth->execute($display, $server, $realuser, $sid) or die $_;
@@ -131,6 +135,7 @@ elsif($cmd eq  "createsession")
 	my $snd_port=shift or die"argument \"snd_port\" missed";
 	my $fs_port=shift or die"argument \"fs_port\" missed";
 	my $sid=shift or die "argument \"session_id\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?,
 	                       client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?");
 	$sth->execute($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid, $realuser)or die;
@@ -144,6 +149,7 @@ elsif($cmd eq  "insertport")
 	my $sid=shift or die "argument \"session_id\" missed";
 	my $sshport=shift or die "argument \"port\" missed";
 	my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values  (?, ?, ?)");
+	check_user($sid);
 	$sth->execute($server, $sid, $sshport) or die;
 	$sth->finish();
 }
@@ -152,6 +158,7 @@ elsif($cmd eq  "resume")
 {
 	my $client=shift or die "argument \"client\" missed";
 	my $sid=shift or die "argument \"session_id\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R',
 	                       client=? where session_id = ? and uname=?");
 	$sth->execute($client, $sid, $realuser) or die;
@@ -162,6 +169,7 @@ elsif($cmd eq  "changestatus")
 {
 	my $status=shift or die "argument \"status\" missed";
 	my $sid=shift or die "argument \"session_id\" missed";
+	check_user($sid);
 	my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),
 	                       status=? where session_id = ? and uname=?");
 	$sth->execute($status, $sid, $realuser)or die;
@@ -170,7 +178,6 @@ elsif($cmd eq  "changestatus")
 
 elsif($cmd eq  "getdisplays")
 {
-
 	#ignore $server
 	my @strings;
 	my $sth=$dbh->prepare("select display from sessions");
@@ -222,6 +229,7 @@ elsif($cmd eq  "getagent")
 {
 	my $sid=shift or die "argument \"session_id\" missed";
 	my $agent;
+	check_user($sid);
 	my $sth=$dbh->prepare("select agent_pid from sessions
 	                       where session_id=?");
 	$sth->execute($sid)or die;
@@ -239,6 +247,7 @@ elsif($cmd eq  "getdisplay")
 {
 	my $sid=shift or die "argument \"session_id\" missed";
 	my $display;
+	check_user($sid);
 	my $sth=$dbh->prepare("select display from sessions
 	                       where session_id =?");
 	$sth->execute($sid)or die;
@@ -296,6 +305,14 @@ sub checkroot
 	}
 }
 
+sub check_user
+{
+	my $sid=shift or die "argument \"session_id\" missed";
+	# session id looks like someuser-51-1304005895_stDgnome-session_dp24
+	my ( $user, $rest ) = split('-', $sid, 2);
+	$user eq $uname or die "$uname is not authorized (should be $user)";
+}
+
 sub fetchrow_printall_array
 {
 	# print all arrays separated by the pipe symbol


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).




More information about the x2go-commits mailing list