x2goserver.git - master (branch) updated: 3.0.99-2-199-g3d85152 - x2go-commits

30 Aug 2011

The branch, master has been updated
       via  3d8515215ebb7d424798583fa27d5168660dfa72 (commit)
       via  826a087d450237abc912d8498f2a7aeeb815065e (commit)
       via  256e0dde5c8b5a5af9ab950ad69c7b788c6672ce (commit)
       via  31f8deabd2a8f1730a11b4093e1efb144cd02041 (commit)
       via  74cb4ab793b6e59aad8497f7facec9deb20be6ce (commit)
       via  6957a368ee4202a90be8c844173196660ad5a8c5 (commit)
       via  2c29f94eb6bef8a28bdcdecf1ad29958bf6a2b82 (commit)
      from  6daaf7bfa7a5cd9dac41d28860ff9569e54f0eb9 (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 3d8515215ebb7d424798583fa27d5168660dfa72
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:14:14 2011 +0200

    and... at last... a compat script...

commit 826a087d450237abc912d8498f2a7aeeb815065e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:12:22 2011 +0200

    ... and more man pages for x2goserver-extensions package

commit 256e0dde5c8b5a5af9ab950ad69c7b788c6672ce
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:11:25 2011 +0200

    ... and here the scripts x2gosessionlimit, x2golistsessions_root...

commit 31f8deabd2a8f1730a11b4093e1efb144cd02041
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:10:23 2011 +0200

    Just realized, that I forgot to re-add many files after the /bin -> /lib migration in x2goserver source tree... So here come the man pages...

commit 74cb4ab793b6e59aad8497f7facec9deb20be6ce
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:09:24 2011 +0200

    Change X2go printing concept: use setgit and a sgid wrapper instead of sudo.

commit 6957a368ee4202a90be8c844173196660ad5a8c5
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 09:06:12 2011 +0200

    Create x2goprint user/group on package installation, add same info to INSTALL howto. Change permissions on x2goprint, using 2755:root:x2goprint (setgid).

commit 2c29f94eb6bef8a28bdcdecf1ad29958bf6a2b82
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Aug 30 08:09:18 2011 +0200

    Spelling fix for error message.

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

Summary of changes:
 debian/changelog                                   |    3 +
 debian/x2goserver.postinst                         |   45 +++++++++++++++++++-
 .../bin}/x2gosuspend-agent                         |    2 +-
 .../x2gosetkeyboard.1 => man8/x2gosetkeyboard.8}   |    2 +-
 .../man/{man1/x2goversion.1 => man8/x2goversion.8} |    2 +-
 x2goserver/{sbin => lib}/x2golistsessions_root     |    8 ++--
 x2goserver/{bin/x2goprint => lib/x2goprint.pl}     |    0
 x2goserver/{bin => lib}/x2gosessionlimit           |    0
 .../x2gocmdexitmessage.8}                          |    2 +-
 .../x2golistdesktops.1 => man8/x2golistdesktops.8} |    2 +-
 .../x2golistsessions.1 => man8/x2golistsessions.8} |    2 +-
 .../{man1/x2gomountdirs.1 => man8/x2gomountdirs.8} |    2 +-
 .../man/{man1/x2goprint.1 => man8/x2goprint.8}     |    2 +-
 .../x2goresume-session.8}                          |    2 +-
 .../x2goruncommand.1 => man8/x2goruncommand.8}     |    2 +-
 .../x2goruncommand.1 => man8/x2goshowblocks.8}     |    2 +-
 .../x2gostartagent.1 => man8/x2gostartagent.8}     |    2 +-
 .../x2gosuspend-session.8}                         |    2 +-
 .../x2goterminate-session.8}                       |    2 +-
 .../x2goumount-session.8}                          |    2 +-
 x2goserver/{x2gosqlitewrapper.c => x2goprint.c}    |   12 +++---
 x2goserver/x2gosqlitewrapper.c                     |    2 +-
 22 files changed, 73 insertions(+), 27 deletions(-)
 copy {x2goserver/lib => x2goserver-compat/bin}/x2gosuspend-agent (94%)
 copy x2goserver-extensions/man/{man1/x2gosetkeyboard.1 => man8/x2gosetkeyboard.8} (92%)
 copy x2goserver-extensions/man/{man1/x2goversion.1 => man8/x2goversion.8} (93%)
 copy x2goserver/{sbin => lib}/x2golistsessions_root (87%)
 rename x2goserver/{bin/x2goprint => lib/x2goprint.pl} (100%)
 copy x2goserver/{bin => lib}/x2gosessionlimit (100%)
 copy x2goserver/man/{man1/x2gocmdexitmessage.1 => man8/x2gocmdexitmessage.8} (87%)
 copy x2goserver/man/{man1/x2golistdesktops.1 => man8/x2golistdesktops.8} (87%)
 copy x2goserver/man/{man1/x2golistsessions.1 => man8/x2golistsessions.8} (87%)
 copy x2goserver/man/{man1/x2gomountdirs.1 => man8/x2gomountdirs.8} (87%)
 copy x2goserver/man/{man1/x2goprint.1 => man8/x2goprint.8} (87%)
 copy x2goserver/man/{man1/x2goresume-session.1 => man8/x2goresume-session.8} (88%)
 copy x2goserver/man/{man1/x2goruncommand.1 => man8/x2goruncommand.8} (87%)
 copy x2goserver/man/{man1/x2goruncommand.1 => man8/x2goshowblocks.8} (87%)
 copy x2goserver/man/{man1/x2gostartagent.1 => man8/x2gostartagent.8} (93%)
 copy x2goserver/man/{man1/x2gosuspend-session.1 => man8/x2gosuspend-session.8} (88%)
 copy x2goserver/man/{man1/x2goterminate-session.1 => man8/x2goterminate-session.8} (88%)
 copy x2goserver/man/{man1/x2goumount-session.1 => man8/x2goumount-session.8} (88%)
 copy x2goserver/{x2gosqlitewrapper.c => x2goprint.c} (83%)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index df05592..2739a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Fix for TERMINAL command execution if konsole (KDE4) is installed on the
     server (closes upstream issue #87).
   * Silence x2golistsessions on missing session.log files.
+  * Create x2goprint user/group on package installation, add same info to INSTALL howto.
+  * Change permissions on x2goprint, using 2755:root:x2goprint (setgid).
+  * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 76cae94..f856e86 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -25,6 +25,10 @@ case "$1" in
 		touch     /etc/x2go/x2gosql/passwords/pgadmin
 		chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
 
+		###
+		### X2go session DB management
+		###
+
 		# setup x2gouser and group
 		if ! getent group x2gouser >/dev/null; then
 			echo "Creating x2gouser group." >&2
@@ -46,7 +50,7 @@ case "$1" in
 			if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then
 				usermod --move-home --home /var/lib/x2go x2gouser
 			fi
-			# leave user shell alone. we have never set this wrongly
+			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices
 		fi
 
@@ -61,6 +65,8 @@ case "$1" in
 			chmod 0660 /var/lib/x2go/x2go_sessions
 		fi
 
+		### setgid section for x2gouser (SQLite DB access)
+
 		# we may be upgrading versions of x2goserver that had
 		# /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser.
 		if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper.pl >/dev/null; then
@@ -80,8 +86,45 @@ case "$1" in
 		if ! dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then
 		    dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper
 		fi
+
+		###
+		### X2go printing
+		###
+
+		# setup x2goprint user and x2goprint group
+		if ! getent group x2goprint >/dev/null; then
+			echo "Creating x2goprint group." >&2
+			addgroup --system x2goprint
+		else
+			echo "Group x2goprint already exists." >&2
+		fi
+		if ! getent passwd x2goprint >/dev/null; then
+			echo "Creating x2goprint user." >&2
+			adduser --system --no-create-home \
+			        --disabled-password --disabled-login \
+			        --shell /bin/false --group --home /var/spool/x2goprint x2goprint
+		else
+			echo "User x2goprint already exists." >&2
+			# make sure all settings are appropriate
+			if [ "`id -gn x2gprint`" != "x2goprint" ]; then
+				usermod --gid x2goprint# x2goprint
+			fi
+			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
+				usermod --move-home --home /var/spool/x2goprint x2goprint
+			fi
+			# we leave user shell alone. we have never set this wrongly
+			# and we need to respect the administrator's choices
+		fi
+
+		### setgid section for x2goprint (X2go printing)
+
+		# the x2goprint command can only be run by users that are in group x2goprint
+		if ! dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then
+		    dpkg-statoverride --add --update root x2goprint 2755 /usr/bin/x2goprint
+		fi
 		;;
 
+
 	abort-upgrade|abort-remove|abort-deconfigure)
 		;;
 
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent
similarity index 94%
copy from x2goserver/lib/x2gosuspend-agent
copy to x2goserver-compat/bin/x2gosuspend-agent
index 272d819..9ca6d4f 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver-compat/bin/x2gosuspend-agent
@@ -27,4 +27,4 @@ shift;
 my $capt=shift;
 my @words=split(" ",$capt);
 
-system("x2gosuspend-session @words[2] > /dev/null");
\ No newline at end of file
+system("/usr/bin/x2gosuspend-session @words[2] > /dev/null");
\ No newline at end of file
diff --git a/x2goserver-extensions/man/man1/x2gosetkeyboard.1 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8
similarity index 92%
copy from x2goserver-extensions/man/man1/x2gosetkeyboard.1
copy to x2goserver-extensions/man/man8/x2gosetkeyboard.8
index f9e0f1f..702155f 100644
--- a/x2goserver-extensions/man/man1/x2gosetkeyboard.1
+++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosetkeyboard 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
 .SH NAME
 x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
 .SH SYNOPSIS
diff --git a/x2goserver-extensions/man/man1/x2goversion.1 b/x2goserver-extensions/man/man8/x2goversion.8
similarity index 93%
copy from x2goserver-extensions/man/man1/x2goversion.1
copy to x2goserver-extensions/man/man8/x2goversion.8
index a930ceb..bb07d83 100644
--- a/x2goserver-extensions/man/man1/x2goversion.1
+++ b/x2goserver-extensions/man/man8/x2goversion.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goversion 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
 .SH NAME
 x2goversion \- Retrieve Code Versions of X2go Server Components
 .SH SYNOPSIS
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root
similarity index 87%
copy from x2goserver/sbin/x2golistsessions_root
copy to x2goserver/lib/x2golistsessions_root
index df92ff5..1e60493 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/lib/x2golistsessions_root
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
@@ -35,8 +36,6 @@ sub check_stat
 	return 1;
 }
 
-my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
-
 my $uname;
 
 my $serv=shift;
@@ -45,7 +44,8 @@ if ( ! $serv)
 	$serv=hostname;
 }
 
-my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`;
+my $outp=`x2golistsessions_sql $serv 2>/dev/null`;
+
 
 my @outp=split("\n","$outp");
 
@@ -62,7 +62,7 @@ for (my $i=0;$i<@outp;$i++)
 		{
 			if (!check_stat(@sinfo[1],@sinfo[11]))
 			{
-				system("su - @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
+				system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
 				@outp[$i] =~ s/\|R\|/\|S\|/;
 			}
 		}
diff --git a/x2goserver/bin/x2goprint b/x2goserver/lib/x2goprint.pl
similarity index 100%
rename from x2goserver/bin/x2goprint
rename to x2goserver/lib/x2goprint.pl
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit
similarity index 100%
copy from x2goserver/bin/x2gosessionlimit
copy to x2goserver/lib/x2gosessionlimit
diff --git a/x2goserver/man/man1/x2gocmdexitmessage.1 b/x2goserver/man/man8/x2gocmdexitmessage.8
similarity index 87%
copy from x2goserver/man/man1/x2gocmdexitmessage.1
copy to x2goserver/man/man8/x2gocmdexitmessage.8
index 1c28470..14681ba 100644
--- a/x2goserver/man/man1/x2gocmdexitmessage.1
+++ b/x2goserver/man/man8/x2gocmdexitmessage.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gocmdexitmessage 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goexitmessage \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2golistdesktops.1 b/x2goserver/man/man8/x2golistdesktops.8
similarity index 87%
copy from x2goserver/man/man1/x2golistdesktops.1
copy to x2goserver/man/man8/x2golistdesktops.8
index c1bab38..1436bda 100644
--- a/x2goserver/man/man1/x2golistdesktops.1
+++ b/x2goserver/man/man8/x2golistdesktops.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistdesktops 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2golistdesktops 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2golistdesktops \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2golistsessions.1 b/x2goserver/man/man8/x2golistsessions.8
similarity index 87%
copy from x2goserver/man/man1/x2golistsessions.1
copy to x2goserver/man/man8/x2golistsessions.8
index 7dfd17d..54f85b3 100644
--- a/x2goserver/man/man1/x2golistsessions.1
+++ b/x2goserver/man/man8/x2golistsessions.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistsessions 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2golistsessions 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2golistsessions \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2gomountdirs.1 b/x2goserver/man/man8/x2gomountdirs.8
similarity index 87%
copy from x2goserver/man/man1/x2gomountdirs.1
copy to x2goserver/man/man8/x2gomountdirs.8
index f8bb5f8..fec5c97 100644
--- a/x2goserver/man/man1/x2gomountdirs.1
+++ b/x2goserver/man/man8/x2gomountdirs.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gomountdirs 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gomountdirs 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2gomountdirs \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goprint.1 b/x2goserver/man/man8/x2goprint.8
similarity index 87%
copy from x2goserver/man/man1/x2goprint.1
copy to x2goserver/man/man8/x2goprint.8
index d1e09c2..542aa2c 100644
--- a/x2goserver/man/man1/x2goprint.1
+++ b/x2goserver/man/man8/x2goprint.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goprint 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goprint 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goprint \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goresume-session.1 b/x2goserver/man/man8/x2goresume-session.8
similarity index 88%
copy from x2goserver/man/man1/x2goresume-session.1
copy to x2goserver/man/man8/x2goresume-session.8
index f12d0a9..f18f421 100644
--- a/x2goserver/man/man1/x2goresume-session.1
+++ b/x2goserver/man/man8/x2goresume-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goresume-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goresume-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goresume-session \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goruncommand.1 b/x2goserver/man/man8/x2goruncommand.8
similarity index 87%
copy from x2goserver/man/man1/x2goruncommand.1
copy to x2goserver/man/man8/x2goruncommand.8
index 145b238..370d907 100644
--- a/x2goserver/man/man1/x2goruncommand.1
+++ b/x2goserver/man/man8/x2goruncommand.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goruncommand 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goruncommand \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goruncommand.1 b/x2goserver/man/man8/x2goshowblocks.8
similarity index 87%
copy from x2goserver/man/man1/x2goruncommand.1
copy to x2goserver/man/man8/x2goshowblocks.8
index 145b238..370d907 100644
--- a/x2goserver/man/man1/x2goruncommand.1
+++ b/x2goserver/man/man8/x2goshowblocks.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goruncommand 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goruncommand \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2gostartagent.1 b/x2goserver/man/man8/x2gostartagent.8
similarity index 93%
copy from x2goserver/man/man1/x2gostartagent.1
copy to x2goserver/man/man8/x2gostartagent.8
index 16f0a8c..6a84a72 100644
--- a/x2goserver/man/man1/x2gostartagent.1
+++ b/x2goserver/man/man8/x2gostartagent.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gostartagent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2gostartagent \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2gosuspend-session.1 b/x2goserver/man/man8/x2gosuspend-session.8
similarity index 88%
copy from x2goserver/man/man1/x2gosuspend-session.1
copy to x2goserver/man/man8/x2gosuspend-session.8
index aeee450..ec4aa2c 100644
--- a/x2goserver/man/man1/x2gosuspend-session.1
+++ b/x2goserver/man/man8/x2gosuspend-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2gosuspend-session \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goterminate-session.1 b/x2goserver/man/man8/x2goterminate-session.8
similarity index 88%
copy from x2goserver/man/man1/x2goterminate-session.1
copy to x2goserver/man/man8/x2goterminate-session.8
index 60f53fa..2bfcce8 100644
--- a/x2goserver/man/man1/x2goterminate-session.1
+++ b/x2goserver/man/man8/x2goterminate-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goterminate-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goterminate-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goterminate-session \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/man/man1/x2goumount-session.1 b/x2goserver/man/man8/x2goumount-session.8
similarity index 88%
copy from x2goserver/man/man1/x2goumount-session.1
copy to x2goserver/man/man8/x2goumount-session.8
index baef86b..8e8fe0d 100644
--- a/x2goserver/man/man1/x2goumount-session.1
+++ b/x2goserver/man/man8/x2goumount-session.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goumount-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goumount-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2goumount-session \- X2go Server Script
 .SH SYNOPSIS
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2goprint.c
similarity index 83%
copy from x2goserver/x2gosqlitewrapper.c
copy to x2goserver/x2goprint.c
index 63320f1..8f177ca 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2goprint.c
@@ -31,7 +31,7 @@
 
 
 int main( int argc, char *argv[] ) {
-	char * x2gosqlitewrapper = NULL;
+	char * x2goprint = NULL;
 	size_t path_max;
 	
 /*
@@ -58,13 +58,13 @@ int main( int argc, char *argv[] ) {
 			exit(EXIT_FAILURE);
 		}
 		if(rvrl >= path_max){
-			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is to long (> %i)", path_max);
+			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max);
 			exit(EXIT_FAILURE);
 		}
 
 
-		// derive the full path of x2gosqlitewrapper.pl from path of this binary
-		rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
+		// derive the full path of x2goprint.pl from path of this binary
+		rvap = asprintf(&x2goprint, "%s/../lib/x2go/%s", dirname(buffer), "x2goprint.pl");
 		if(rvap == -1){
 			fprintf(stderr, "Failed to allocate memory calling asprintf\n");
 			exit(EXIT_FAILURE);
@@ -72,12 +72,12 @@ int main( int argc, char *argv[] ) {
 
 
 		// execute the script, running with user-rights of this binary 
-		execv(x2gosqlitewrapper, argv);
+		execv(x2goprint, argv);
 
 	}
 
 	// ...fail
-	fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno));
+	fprintf(stderr, "Failed to execute %s: %s\n", x2goprint, strerror(errno));
 	return EXIT_FAILURE;
 
 }
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
index 63320f1..95e2a8a 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2gosqlitewrapper.c
@@ -58,7 +58,7 @@ int main( int argc, char *argv[] ) {
 			exit(EXIT_FAILURE);
 		}
 		if(rvrl >= path_max){
-			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is to long (> %i)", path_max);
+			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max);
 			exit(EXIT_FAILURE);
 		}
 


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

    