x2go-commits September 2012

x2go-commits@lists.x2go.org

1 participants
231 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-33-gd845b63
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via d845b630f85954350ff1ff3a767b384976b0a09b (commit) from d34d3656f53de76f961f5c85feb1882b98effab8 (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 d845b630f85954350ff1ff3a767b384976b0a09b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 18 00:43:27 2012 +0200 Transform x2gosqlitewrapper.pl into small wrapper script and move the SQLite3 into Perl package X2Go::Server::DB::SQLite3. ----------------------------------------------------------------------- Summary of changes: .../Server/DB/SQLite3.pm | 219 ++++++---- debian/changelog | 2 + x2goserver/lib/x2gosqlitewrapper.pl | 467 ++------------------ 3 files changed, 170 insertions(+), 518 deletions(-) copy x2goserver/lib/x2gosqlitewrapper.pl => X2Go/Server/DB/SQLite3.pm (76%) The diff of changes is: diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/X2Go/Server/DB/SQLite3.pm similarity index 76% copy from x2goserver/lib/x2gosqlitewrapper.pl copy to X2Go/Server/DB/SQLite3.pm index 94d8f91..a1edb22 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/X2Go/Server/DB/SQLite3.pm @@ -20,11 +20,15 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +package X2Go::Server::DB::SQLite3; + use strict; use DBI; use POSIX; -#### NOTE: this script is run setgid <group> and it cannot do system() calls. +#### NOTE: the default X2Go server setups runs the code in this package +#### via a setgid <group> wrapper (where <group> is group ,,x2gouser''). +#### It is intended that the code in this package cannot do system() calls. use Config::Simple; use Sys::Syslog qw( :standard :macros ); @@ -33,28 +37,31 @@ use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); -#### -#### end of duplicated syslogging code -#### - -# 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 ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); my $realuser=$uname; -my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_; -$dbh->sqlite_busy_timeout( 2000 ); +use base 'Exporter'; -my $cmd=shift or die "command not specified"; -my $rc=0; +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'); -if($cmd eq "rmsessionsroot") +sub init_db { - checkroot(); + # 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"; + my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_; + $dbh->sqlite_busy_timeout( 2000 ); + return $dbh; +} + +sub dbsys_rmsessionsroot +{ + my $dbh = init_db(); + check_root(); my $sid=shift or die "argument \"session_id\" missed"; my $sth=$dbh->prepare("delete from sessions where session_id=?"); $sth->execute($sid); @@ -64,11 +71,13 @@ if($cmd eq "rmsessionsroot") die; } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "listsessionsroot") +sub dbsys_listsessionsroot { - checkroot(); + my $dbh = init_db(); + check_root(); my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, @@ -83,12 +92,16 @@ elsif($cmd eq "listsessionsroot") syslog('error', "listsessionsroot (SQLite3 session db backend) failed with exitcode: $sth->err()"); die(); } - fetchrow_printall_array($sth); + my @sessions = fetchrow_array_session_entries($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; } -elsif($cmd eq "listsessionsroot_all") +sub listsessionsroot_all { - checkroot(); + my $dbh = init_db(); + check_root(); my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, strftime('%Y-%m-%dT%H:%M:%S',init_time), @@ -103,11 +116,15 @@ elsif($cmd eq "listsessionsroot_all") syslog('error', "listsessionsroot_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); die(); } - fetchrow_printall_array($sth); + my @sessions = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; } -elsif($cmd eq "getmounts") +sub db_getmounts { + my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; check_user($sid); my @strings; @@ -118,11 +135,15 @@ elsif($cmd eq "getmounts") syslog('error', "getmounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); die; } - fetchrow_printall_array($sth); + my @mounts = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @mounts; } -elsif($cmd eq "deletemount") +sub db_deletemount { + my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; my $path=shift or die "argument \"path\" missed"; check_user($sid); @@ -134,41 +155,49 @@ elsif($cmd eq "deletemount") die(); } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "deletemounts") +sub db_deletemounts { - my $sid=shift or die "argument \"session_id\" missed"; - check_user($sid); - my $sth=$dbh->prepare("delete from mounts where session_id=?"); - $sth->execute($sid); - if ($sth->err()) - { - syslog('error', "deletemounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); + my $dbh = init_db(); + my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); + my $sth=$dbh->prepare("delete from mounts where session_id=?"); + $sth->execute($sid); + if ($sth->err()) + { + syslog('error', "deletemounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); + die(); + } + $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "insertmount") +sub db_insertmount { + my $dbh = init_db(); 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); + my $success = 0; if(! $sth->err()) { - print "ok"; + $success = 1; } else { syslog('debug', "insertmount (SQLite3 session db backend) failed with exitcode: $sth->err(), this issue will be interpreted as: SSHFS share already mounted"); } $sth->finish(); + $dbh->disconnect(); + return $success; } -elsif($cmd eq "insertsession") +sub db_insertsession { + my $dbh = init_db(); 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"; @@ -177,11 +206,13 @@ elsif($cmd eq "insertsession") (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))"); $sth->execute($display, $server, $realuser, $sid) or die $_; $sth->finish(); - print "ok"; + $dbh->disconnect(); + return 1; } -elsif($cmd eq "createsession") +sub db_createsession { + my $dbh = init_db(); my $cookie=shift or die"argument \"cookie\" missed"; my $pid=shift or die"argument \"pid\" missed"; my $client=shift or die"argument \"client\" missed"; @@ -199,11 +230,13 @@ elsif($cmd eq "createsession") die(); } $sth->finish(); - print "ok"; + $dbh->disconnect(); + return 1; } -elsif($cmd eq "insertport") +sub db_insertport { + my $dbh = init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; my $sshport=shift or die "argument \"port\" missed"; @@ -216,10 +249,12 @@ elsif($cmd eq "insertport") die(); } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "rmport") +sub db_rmport { + my $dbh = init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; my $sshport=shift or die "argument \"port\" missed"; @@ -231,10 +266,12 @@ elsif($cmd eq "rmport") die(); } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "resume") +sub db_resume { + my $dbh = init_db(); my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; my $gr_port=shift or die "argument \"gr_port\" missed"; @@ -250,10 +287,12 @@ elsif($cmd eq "resume") die(); } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "changestatus") +sub db_changestatus { + my $dbh = init_db(); my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; check_user($sid); @@ -266,10 +305,12 @@ elsif($cmd eq "changestatus") die(); } $sth->finish(); + $dbh->disconnect(); } -elsif($cmd eq "getstatus") +sub db_getstatus { + my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; check_user($sid); my $sth=$dbh->prepare("select status from sessions where session_id = ?"); @@ -283,14 +324,16 @@ elsif($cmd eq "getstatus") my $status; @data = $sth->fetchrow_array; { - $status = @data[0]; + $status = $data[0]; } $sth->finish(); - print $status; + $dbh->disconnect(); + return $status; } -elsif($cmd eq "getdisplays") +sub db_getdisplays { + my $dbh = init_db(); #ignore $server my @strings; my $sth=$dbh->prepare("select display from sessions"); @@ -304,15 +347,16 @@ elsif($cmd eq "getdisplays") my $i=0; while (@data = $sth->fetchrow_array) { - @strings[$i++]='|'.@data[0].'|'; + $strings[$i++]='|'.$data[0].'|'; } $sth->finish(); - print join("\n",@strings); + $dbh->disconnect(); + return join("\n",@strings); } -elsif($cmd eq "getports") +sub db_getports { - + my $dbh = init_db(); #ignore $server my $server=shift or die "argument \"server\" missed"; my @strings; @@ -327,14 +371,16 @@ elsif($cmd eq "getports") my $i=0; while (@data = $sth->fetchrow_array) { - @strings[$i++]='|'.@data[0].'|'; + $strings[$i++]='|'.$data[0].'|'; } $sth->finish(); - print join("\n",@strings); + $dbh->disconnect(); + return join("\n",@strings); } -elsif($cmd eq "getservers") +sub db_getservers { + my $dbh = init_db(); my @strings; my $sth=$dbh->prepare("select server,count(*) from sessions where status != 'F' group by server"); $sth->execute(); @@ -347,14 +393,16 @@ elsif($cmd eq "getservers") my $i=0; while (@data = $sth->fetchrow_array) { - @strings[$i++]=@data[0]; + $strings[$i++]=$data[0]; } $sth->finish(); - print join("\n",@strings); + $dbh->disconnect(); + return join("\n",@strings); } -elsif($cmd eq "getagent") +sub db_getagent { + my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; my $agent; check_user($sid); @@ -370,14 +418,16 @@ elsif($cmd eq "getagent") my $i=0; if(@data = $sth->fetchrow_array) { - $agent=@data[0]; + $agent=$data[0]; } $sth->finish(); - print $agent; + $dbh->disconnect(); + return $agent; } -elsif($cmd eq "getdisplay") +sub db_getdisplay { + my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; my $display; check_user($sid); @@ -393,14 +443,16 @@ elsif($cmd eq "getdisplay") my $i=0; if(@data = $sth->fetchrow_array) { - $display=@data[0]; + $display=$data[0]; } $sth->finish(); - print $display; + $dbh->disconnect(); + return $display; } -elsif($cmd eq "listsessions") +sub db_listsessions { + my $dbh = init_db(); my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, @@ -417,11 +469,15 @@ elsif($cmd eq "listsessions") syslog('error', "listsessions (SQLite3 session db backend) failed with exitcode: $sth->err()"); die(); } - fetchrow_printall_array($sth); + my @sessions = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; } -elsif($cmd eq "listsessions_all") +sub listsessions_all { + my $dbh = init_db(); my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, strftime('%Y-%m-%dT%H:%M:%S',init_time), @@ -437,16 +493,13 @@ elsif($cmd eq "listsessions_all") syslog('error', "listsessions_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); die(); } - fetchrow_printall_array($sth); -} -else -{ - print "unknown command $cmd\n"; + my @sessions = fetchrow_array_datasets($sth); + $sth->finish(); + $dbh->disconnect(); + return @sessions; } -$dbh->disconnect(); - -sub checkroot +sub check_root { if ($realuser ne "root") { @@ -465,16 +518,16 @@ sub check_user $user eq $realuser or die "$realuser is not authorized"; } -sub fetchrow_printall_array +sub fetchrow_array_datasets { - # print all arrays separated by the pipe symbol - local $, = '|'; - my $sth = shift; + my @lines; my @data; while (@data = $sth->fetchrow_array()) { - print @data, "\n"; + push @lines, join('|', @data); } - $sth->finish(); + return @lines; } + +1; diff --git a/debian/changelog b/debian/changelog index a83f152..e215b2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low that the LD_LIBRARY_PATH variable stays intact. Closes #29. - Transform x2gologlevel.pm into proper Perl module X2Go::Log. - Transform x2godbwrapper.pm into proper Perl module X2Go::Server::DB. + - Transform x2gosqlitewrapper.pl into small wrapper script and move the + SQLite3 into Perl package X2Go::Server::DB::SQLite3. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 94d8f91..5247fee 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -XU # Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org # @@ -21,460 +21,57 @@ # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; -use DBI; -use POSIX; +use Switch; -#### NOTE: this script is run setgid <group> and it cannot do system() calls. - -use Config::Simple; -use Sys::Syslog qw( :standard :macros ); -use X2Go::Log qw(loglevel); - -openlog($0,'cons,pid','user'); -setlogmask( LOG_UPTO(loglevel()) ); - -#### -#### end of duplicated syslogging code -#### - -# 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 ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); -my $realuser=$uname; - -my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_; -$dbh->sqlite_busy_timeout( 2000 ); - -my $cmd=shift or die "command not specified"; -my $rc=0; - -if($cmd eq "rmsessionsroot") -{ - checkroot(); - my $sid=shift or die "argument \"session_id\" missed"; - my $sth=$dbh->prepare("delete from sessions where session_id=?"); - $sth->execute($sid); - if ($sth->err()) - { - syslog('error', "rmsessionsroot (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die; - } - $sth->finish(); -} - -elsif($cmd eq "listsessionsroot") -{ - checkroot(); - my $server=shift or die "argument \"server\" missed"; - my @strings; - my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - strftime('%Y-%m-%dT%H:%M:%S',init_time), - cookie,client,gr_port,sound_port, - strftime('%Y-%m-%dT%H:%M:%S',last_time), - uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions - where server=? order by status desc"); - $sth->execute($server); - if ($sth->err()) { - syslog('error', "listsessionsroot (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - fetchrow_printall_array($sth); -} - -elsif($cmd eq "listsessionsroot_all") -{ - checkroot(); - my @strings; - my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - strftime('%Y-%m-%dT%H:%M:%S',init_time), - cookie,client,gr_port,sound_port, - strftime('%Y-%m-%dT%H:%M:%S',last_time), - uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions - order by status desc"); - $sth->execute(); - if ($sth->err()) - { - syslog('error', "listsessionsroot_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - fetchrow_printall_array($sth); -} - -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); - if ($sth->err()) - { - syslog('error', "getmounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die; - } - fetchrow_printall_array($sth); -} - -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); - if ($sth->err()) - { - syslog('error', "deletemount (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} +use X2Go::Server::DB::SQLite3; -elsif($cmd eq "deletemounts") -{ - my $sid=shift or die "argument \"session_id\" missed"; - check_user($sid); - my $sth=$dbh->prepare("delete from mounts where session_id=?"); - $sth->execute($sid); - if ($sth->err()) - { - syslog('error', "deletemounts (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} +#### NOTE: this script is run setgid <group> and it cannot do system() calls. -elsif($cmd eq "insertmount") +sub print_result { - 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()) + my $retval = shift; + if ( $retval =~ /^(0|1)/ ) { - print "ok"; + if ( $retval ) + { + print "ok"; + } } else { - syslog('debug', "insertmount (SQLite3 session db backend) failed with exitcode: $sth->err(), this issue will be interpreted as: SSHFS share already mounted"); - } - $sth->finish(); -} - -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 $_; - $sth->finish(); - print "ok"; -} - -elsif($cmd eq "createsession") -{ - my $cookie=shift or die"argument \"cookie\" missed"; - my $pid=shift or die"argument \"pid\" missed"; - my $client=shift or die"argument \"client\" missed"; - my $gr_port=shift or die"argument \"gr_port\" missed"; - 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); - if ($sth->err()) - { - syslog('error', "createsession (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); - print "ok"; -} - -elsif($cmd eq "insertport") -{ - my $server=shift or die "argument \"server\" missed"; - 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); - if ($sth->err()) - { - syslog('error', "insertport (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} - -elsif($cmd eq "rmport") -{ - my $server=shift or die "argument \"server\" missed"; - my $sid=shift or die "argument \"session_id\" missed"; - my $sshport=shift or die "argument \"port\" missed"; - my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); - check_user($sid); - $sth->execute($server, $sid, $sshport); - if ($sth->err()) { - syslog('error', "rmport (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} - -elsif($cmd eq "resume") -{ - my $client=shift or die "argument \"client\" missed"; - my $sid=shift or die "argument \"session_id\" missed"; - my $gr_port=shift or die "argument \"gr_port\" missed"; - my $sound_port=shift or die "argument \"sound_port\" missed"; - my $fs_port=shift or die "argument \"fs_port\" missed"; - check_user($sid); - my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R', - client=?,gr_port=?,sound_port=?,fs_port=? where session_id = ? and uname=?"); - $sth->execute($client, $gr_port, $sound_port, $fs_port, $sid, $realuser); - if ($sth->err()) - { - syslog('error', "resume (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} - -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); - if ($sth->err()) - { - syslog('error', "changestatus (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - $sth->finish(); -} - -elsif($cmd eq "getstatus") -{ - my $sid=shift or die "argument \"session_id\" missed"; - check_user($sid); - my $sth=$dbh->prepare("select status from sessions where session_id = ?"); - $sth->execute($sid); - if ($sth->err()) - { - syslog('error', "changestatus (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - my @data; - my $status; - @data = $sth->fetchrow_array; - { - $status = @data[0]; - } - $sth->finish(); - print $status; -} - -elsif($cmd eq "getdisplays") -{ - #ignore $server - my @strings; - my $sth=$dbh->prepare("select display from sessions"); - $sth->execute(); - if ($sth->err()) - { - syslog('error', "getdisplays (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]='|'.@data[0].'|'; - } - $sth->finish(); - print join("\n",@strings); -} - -elsif($cmd eq "getports") -{ - - #ignore $server - my $server=shift or die "argument \"server\" missed"; - my @strings; - my $sth=$dbh->prepare("select port from used_ports"); - $sth->execute(); - if ($sth->err()) - { - syslog('error', "getports (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]='|'.@data[0].'|'; - } - $sth->finish(); - print join("\n",@strings); -} - -elsif($cmd eq "getservers") -{ - my @strings; - my $sth=$dbh->prepare("select server,count(*) from sessions where status != 'F' group by server"); - $sth->execute(); - if ($sth->err()) - { - syslog('error', "getservers (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - my @data; - my $i=0; - while (@data = $sth->fetchrow_array) - { - @strings[$i++]=@data[0]; - } - $sth->finish(); - print join("\n",@strings); -} - -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); - if ($sth->err()) - { - syslog('error', "getagent (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); + print $retval; } - my @data; - my $i=0; - if(@data = $sth->fetchrow_array) - { - $agent=@data[0]; - } - $sth->finish(); - print $agent; } -elsif($cmd eq "getdisplay") +sub print_array { - 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); - if ($sth->err()) - { - syslog('error', "getdisplay (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - my @data; - my $i=0; - if(@data = $sth->fetchrow_array) + # print all arrays separated by the pipe symbol + local $, = '|'; + print "THIS IS AN ARRAY!!!!"; + while (<>) { - $display=@data[0]; + print $_, "\n"; } - $sth->finish(); - print $display; } -elsif($cmd eq "listsessions") -{ - my $server=shift or die "argument \"server\" missed"; - my @strings; - my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - strftime('%Y-%m-%dT%H:%M:%S',init_time), - cookie,client,gr_port,sound_port, - strftime('%Y-%m-%dT%H:%M:%S',last_time), - uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions - where status !='F' and server=? and uname=? - and ( session_id not like '%XSHAD%') order by status desc"); - $sth->execute($server, $realuser); - if ($sth->err()) - { - syslog('error', "listsessions (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - fetchrow_printall_array($sth); -} +my $result; +my $cmd=shift or die "command not specified"; -elsif($cmd eq "listsessions_all") +# call the corresponding function in the X2Go::Server:DB:SQLite3 package +switch ($cmd) { - my @strings; - my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - strftime('%Y-%m-%dT%H:%M:%S',init_time), - cookie,client,gr_port,sound_port, - strftime('%Y-%m-%dT%H:%M:%S',last_time), - uname, - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions - where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); - - $sth->execute($realuser); - if ($sth->err()) - { - syslog('error', "listsessions_all (SQLite3 session db backend) failed with exitcode: $sth->err()"); - die(); - } - fetchrow_printall_array($sth); -} -else -{ - print "unknown command $cmd\n"; + case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") } + else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } } -$dbh->disconnect(); - -sub checkroot +# depending on the type of $result we do different things... +print $result; +if ( defined($result) ) { - if ($realuser ne "root") + if ( ref($result) eq "ARRAY" ) { - die "$realuser, you can not do this job"; + print_array($result); + } else { + print_result($result); } } -sub check_user -{ - my $sid=shift or die "argument \"session_id\" missed"; - return if $realuser eq "root"; - # session id looks like someuser-51-1304005895_stDgnome-session_dp24 - # during DB insertsession it only looks like someuser-51-1304005895 - my $user = "$sid"; - $user =~ s/$realuser-[0-9]{2,}-[0-9]{10,}.*/$realuser/; - $user eq $realuser or die "$realuser is not authorized"; -} - -sub fetchrow_printall_array -{ - # print all arrays separated by the pipe symbol - local $, = '|'; - - my $sth = shift; - my @data; - while (@data = $sth->fetchrow_array()) - { - print @data, "\n"; - } - $sth->finish(); -} +exit (0); 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).

1 0

x2goclient.git - master (branch) updated: 3.99.2.2-48-ga681201
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via a681201e8d7a961522c9cf76f7bf13f79ba539f5 (commit) from 28739bee81dc6c3ad9050d0b468436589de3f0ad (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 a681201e8d7a961522c9cf76f7bf13f79ba539f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 20:45:12 2012 +0200 Fix creation of session profile icon on desktop. The .desktop files need the x-bit set. Also: add a compatibility profile name rewrite for PyHoca-GUI profile names containing a slash, PyHoca-GUI uses a slash as separator character for submenu cascades. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ onmainwindow.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0ab6b6d..d9db3d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low login dialog. Only replace username+password if they received a value from the login widget of the main window. - Drop i18n idea to translate English to English. + - Fix creation of session profile icon on desktop. The .desktop + files need the x-bit set. Also: add a compatibility profile name + rewrite for PyHoca-GUI profile names containing a slash, PyHoca-GUI + uses a slash as separator character for submenu cascades. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Add rdesktop and xfreerdp to Recommends. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index c67a0ea..709809b 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2023,6 +2023,10 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) QString name=st.setting()->value ( bt->id() +"/name", ( QVariant ) tr ( "New Session" ) ).toString() ; + + // PyHoca-GUI uses the slash as separator for cascaded menus, so let's handle these on the file system + name.replace("/","::"); + QString sessIcon=st.setting()->value ( bt->id() +"/icon", ( QVariant ) @@ -2045,13 +2049,14 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) cmd="x2goclient --hide"; QTextStream out ( &file ); out << "[Desktop Entry]\n"<< - "Exec[$e]="<<cmd<<" --sessionid="<<bt->id() <<"\n"<< + "Exec="<<cmd<<" --sessionid="<<bt->id() <<"\n"<< "Icon="<<sessIcon<<"\n"<< "Name="<<name<<"\n"<< "StartupNotify=true\n"<< "Terminal=false\n"<< "Type=Application\n"<< "X-KDE-SubstituteUID=false\n"; + file.setPermissions(QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner); file.close(); #else QString scrname=QDir::tempPath() +"\\mklnk.vbs"; hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.14-12-gb8db519
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via b8db5192d8b60c4371aa339e0762268efd62d53f (commit) from b9a7a1b4fe1b74fb734da22364ea42a42e88368c (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 b8db5192d8b60c4371aa339e0762268efd62d53f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 18:50:50 2012 +0200 Add patch: 220_nxproxy-bind-loopback-only.full+lite.patch, adds loopback option to nxproxy options and forces nxproxy to bind to loopback devices only. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- ...220_nxproxy-bind-loopback-only.full+lite.patch} | 0 debian/patches/series | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename debian/patches/{220_nxproxy-bind-loopback-only.patch => 220_nxproxy-bind-loopback-only.full+lite.patch} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 630d97e..90f1732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. - * Add patch: 220_nxproxy-bind-loopback-only.patch, adds loopback option to - nxproxy options and forces nxproxy to bind to loopback devices only. + * Add patch: 220_nxproxy-bind-loopback-only.full+lite.patch, adds loopback + option to nxproxy options and forces nxproxy to bind to loopback devices + only. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 diff --git a/debian/patches/220_nxproxy-bind-loopback-only.patch b/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch similarity index 100% rename from debian/patches/220_nxproxy-bind-loopback-only.patch rename to debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch diff --git a/debian/patches/series b/debian/patches/series index bffdb97..3c4a167 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,7 +40,7 @@ 202_nx-x11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch 209_x2goagent-add-man-page.full.patch -220_nxproxy-bind-loopback-only.patch +220_nxproxy-bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.14-11-gb9a7a1b
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via b9a7a1b4fe1b74fb734da22364ea42a42e88368c (commit) from f83009075ecc3baa1087b42ef385a0870ec71daa (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 b9a7a1b4fe1b74fb734da22364ea42a42e88368c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 16:50:15 2012 +0200 Add patch: 220_nxproxy-bind-loopback-only.patch, adds loopback option to nxproxy options and forces nxproxy to bind to loopback devices only. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + .../patches/220_nxproxy-bind-loopback-only.patch | 130 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 133 insertions(+), 0 deletions(-) create mode 100644 debian/patches/220_nxproxy-bind-loopback-only.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e281ea7..630d97e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. + * Add patch: 220_nxproxy-bind-loopback-only.patch, adds loopback option to + nxproxy options and forces nxproxy to bind to loopback devices only. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 diff --git a/debian/patches/220_nxproxy-bind-loopback-only.patch b/debian/patches/220_nxproxy-bind-loopback-only.patch new file mode 100644 index 0000000..b8f8765 --- /dev/null +++ b/debian/patches/220_nxproxy-bind-loopback-only.patch @@ -0,0 +1,130 @@ +Description: Force NX proxy to bind to loopback devices only (loopback option) +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +--- a/nxcomp/Loop.cpp ++++ b/nxcomp/Loop.cpp +@@ -952,6 +952,7 @@ + static char displayHost[DEFAULT_STRING_LENGTH] = { 0 }; + static char authCookie[DEFAULT_STRING_LENGTH] = { 0 }; + ++static int loopbackBind = DEFAULT_LOOPBACK_BIND; + static int proxyPort = DEFAULT_NX_PROXY_PORT; + static int xPort = DEFAULT_NX_X_PORT; + +@@ -3959,7 +3960,14 @@ + + tcpAddr.sin_family = AF_INET; + tcpAddr.sin_port = htons(proxyPortTCP); +- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ if ( loopbackBind ) ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ++ } ++ else ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ } + + if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1) + { +@@ -4512,7 +4520,14 @@ + + tcpAddr.sin_family = AF_INET; + tcpAddr.sin_port = htons(portTCP); +- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ if ( loopbackBind ) ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ++ } ++ else ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ } + + if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1) + { +@@ -6680,7 +6695,14 @@ + + #ifdef __APPLE__ + +- tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ if ( loopbackBind ) ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ++ } ++ else ++ { ++ tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY); ++ } + + #else + +@@ -8359,6 +8381,10 @@ + + listenPort = ValidateArg("local", name, value); + } ++ else if (strcasecmp(name, "loopback") == 0) ++ { ++ loopbackBind = ValidateArg("local", name, value); ++ } + else if (strcasecmp(name, "accept") == 0) + { + if (*connectHost != '\0') +@@ -13735,7 +13761,14 @@ + } + else + { +- address = htonl(INADDR_ANY); ++ if ( loopbackBind ) ++ { ++ address = htonl(INADDR_LOOPBACK); ++ } ++ else ++ { ++ address = htonl(INADDR_ANY); ++ } + } + } + else +--- a/nxcomp/Misc.cpp ++++ b/nxcomp/Misc.cpp +@@ -42,6 +42,14 @@ + #undef DEBUG + + // ++// By default nxproxy binds to all network interfaces, setting ++// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback ++// device only. ++// ++ ++const int DEFAULT_LOOPBACK_BIND = 0; ++ ++// + // TCP port offset applied to any NX port specification. + // + +@@ -137,6 +145,8 @@ + \n\ + listen=n Local port used for accepting the proxy connection.\n\ + \n\ ++ loopback=b Bind to the loopback device only.\n\ ++\n\ + accept=s Name or IP of host that can connect to the proxy.\n\ + \n\ + connect=s Name or IP of host that the proxy will connect to.\n\ +--- a/nxcomp/Misc.h ++++ b/nxcomp/Misc.h +@@ -90,6 +90,14 @@ + extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET; + + // ++// NX proxy binds to all network interfaces by default ++// With the -loopback parameter, you can switch ++// over to binding to the loopback device only. ++// ++ ++extern const int DEFAULT_LOOPBACK_BIND; ++ ++// + // Return strings containing various info. + // + diff --git a/debian/patches/series b/debian/patches/series index f47979a..bffdb97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,6 +40,7 @@ 202_nx-x11_enable-xinerama.full.patch 203_nxagent_disable-rootless-exit.full.patch 209_x2goagent-add-man-page.full.patch +220_nxproxy-bind-loopback-only.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.9-14-g2ab6c71
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 2ab6c71eeea4a425ad327c9233969dd7994c6aee (commit) via 5a0dd6c27283830e1b18034d88b1af69cbfb6a8d (commit) from 2442e74331d5199bb3e7b816d7a703738ad3578c (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 2ab6c71eeea4a425ad327c9233969dd7994c6aee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 13:59:09 2012 +0200 Revert "NX proxy backend: only accept connections from 127.0.0.1." This reverts commit 5a0dd6c27283830e1b18034d88b1af69cbfb6a8d. commit 5a0dd6c27283830e1b18034d88b1af69cbfb6a8d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 13:40:58 2012 +0200 NX proxy backend: only accept connections from 127.0.0.1. ----------------------------------------------------------------------- Summary of changes: The diff of changes is: hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goclient.git - master (branch) updated: 3.99.2.2-47-g28739be
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 28739bee81dc6c3ad9050d0b468436589de3f0ad (commit) from afb0539b51891920942b9ceae969d53dec454cf9 (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 28739bee81dc6c3ad9050d0b468436589de3f0ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 13:50:14 2012 +0200 Update DirectRDP in Danish translation. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goclient_da.ts | 54 +++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c4ae7a7..0ab6b6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.3.0): - Add Danish translation to x2goclient. - Proof read Danish translation. + - Update DirectRDP in Danish translation. [ Oleksandr Shneyder ] * New upstream version (3.99.3.0): diff --git a/x2goclient_da.ts b/x2goclient_da.ts index d63dccd..01c24c8 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -90,17 +90,17 @@ <message> <location filename="brokerpassdialog.ui" line="22"/> <source>Old password:</source> - <translation>Nuværende Kodeord:</translation> + <translation>Nuværende kodeord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="36"/> <source>New password:</source> - <translation>Nyt Kodeord:</translation> + <translation>Nyt kodeord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="50"/> <source>Confirm password:</source> - <translation>Bekræft Kodeord:</translation> + <translation>Bekræft kodeord:</translation> </message> <message> <location filename="brokerpassdialog.ui" line="79"/> @@ -113,7 +113,7 @@ <message> <location filename="brokerpassdlg.cpp" line="41"/> <source>Passwords do not match</source> - <translation>Kodeordene passer ikke sammen</translation> + <translation>Kodeord er ikke ens</translation> </message> </context> <context> @@ -136,7 +136,7 @@ <message> <location filename="cupsprintwidget.ui" line="49"/> <source>State:</source> - <translation>Status:</translation> + <translation>Tilstand:</translation> </message> <message> <location filename="cupsprintwidget.ui" line="63"/> @@ -161,7 +161,7 @@ <message> <location filename="cupsprintwidget.cpp" line="65"/> <source>Idle</source> - <translation>Ledig</translation> + <translation>Inaktiv</translation> </message> <message> <location filename="cupsprintwidget.cpp" line="68"/> @@ -194,7 +194,7 @@ <message> <location filename="cupsprintersettingsdialog.cpp" line="265"/> <source>This value is in conflict with other option</source> - <translation>Denne værdi konflikter med en anden indstilling</translation> + <translation>Denne værdi er I strid med en anden indstilling</translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="275"/> @@ -251,7 +251,7 @@ <location filename="contest.cpp" line="162"/> <location filename="contest.cpp" line="168"/> <source>Failed: </source> - <translation>Mislykket: </translation> + <translation>Mislykkedes: </translation> </message> </context> <context> @@ -264,22 +264,22 @@ <message> <location filename="configdialog.cpp" line="59"/> <source>Display icon in system tray</source> - <translation>Vis ikon i statusområde</translation> + <translation>Vis ikon i meddelelsesområde</translation> </message> <message> <location filename="configdialog.cpp" line="66"/> <source>Hide to system tray when minimized</source> - <translation>Minimer til statusområde</translation> + <translation>Minimer til meddelelsesområde </translation> </message> <message> <location filename="configdialog.cpp" line="67"/> <source>Hide to system tray when closed</source> - <translation>Skjul i statusområde når programmet lukkes </translation> + <translation>Skjul imeddelelsesområde når programmet lukkes </translation> </message> <message> <location filename="configdialog.cpp" line="68"/> <source>Hide to system tray after connection is established</source> - <translation>Minimer til statusområde efter forbindelse til server</translation> + <translation>Minimer til meddelelsesområde efter forbindelse til server</translation> </message> <message> <location filename="configdialog.cpp" line="69"/> @@ -335,7 +335,7 @@ <message> <location filename="configdialog.cpp" line="250"/> <source>Clientside SSH port for file system export usage:</source> - <translation>Klientens SSH port til filsystem-exportering:</translation> + <translation>Klientens SSH port til filsystem-eksportering:</translation> </message> <message> <location filename="configdialog.cpp" line="260"/> @@ -558,7 +558,7 @@ <message> <location filename="editconnectiondialog.cpp" line="117"/> <source>Session preferences - </source> - <translation>Sessionsindstillinger</translation> + <translation>Sessions indstillinger</translation> </message> </context> <context> @@ -576,7 +576,7 @@ <message> <location filename="exportdialog.cpp" line="45"/> <source>&Preferences ...</source> - <translation>&Indstilliger ...</translation> + <translation>&Indstillinger ...</translation> </message> <message> <location filename="exportdialog.cpp" line="46"/> @@ -2050,7 +2050,7 @@ f.eks: <location filename="sessionbutton.cpp" line="483"/> <location filename="sessionbutton.cpp" line="731"/> <source>Maximum</source> - <translation type="unfinished"></translation> + <translation>Maximum</translation> </message> <message> <location filename="sessionbutton.cpp" line="490"/> @@ -2214,12 +2214,12 @@ f.eks: <message> <location filename="sessionwidget.cpp" line="168"/> <source>Direct RDP Connection</source> - <translation type="unfinished"></translation> + <translation>Direkte RDP Forbindelse</translation> </message> <message> <location filename="sessionwidget.cpp" line="233"/> <source>RDP port:</source> - <translation type="unfinished"></translation> + <translation>RDP port:</translation> </message> <message> <location filename="sessionwidget.cpp" line="249"/> @@ -2298,7 +2298,7 @@ f.eks: <message> <location filename="settingswidget.cpp" line="49"/> <source>RDP Client</source> - <translation type="unfinished"></translation> + <translation>RDP Klient</translation> </message> <message> <location filename="settingswidget.cpp" line="61"/> @@ -2323,7 +2323,7 @@ f.eks: <message> <location filename="settingswidget.cpp" line="69"/> <source>Maximum available</source> - <translation type="unfinished"></translation> + <translation>Maximalt tilgængelige</translation> </message> <message> <location filename="settingswidget.cpp" line="80"/> @@ -2410,12 +2410,12 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="settingswidget.cpp" line="252"/> <source>Additional parameters:</source> - <translation type="unfinished"></translation> + <translation>Yderligere paramentre:</translation> </message> <message> <location filename="settingswidget.cpp" line="253"/> <source>Command line:</source> - <translation type="unfinished"></translation> + <translation>Kommandolinje:</translation> </message> <message> <location filename="settingswidget.cpp" line="642"/> @@ -2430,7 +2430,7 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="settingswidget.cpp" line="757"/> <source>password</source> - <translation type="unfinished"></translation> + <translation>kodeord</translation> </message> </context> <context> @@ -2484,7 +2484,7 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="sharewidget.cpp" line="95"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>Brug ssh port forwarding til at føre filsystemsforbindelsen igennem firewalls</translation> + <translation>Brug ssh port forwarding til at føre filsystemsforbindelser igennem firewalls</translation> </message> <message> <location filename="sharewidget.cpp" line="158"/> @@ -2653,7 +2653,7 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="xsettingsui.ui" line="78"/> <source>executable:</source> - <translation>Eksekverbar fil:</translation> + <translation>eksekverbar:</translation> </message> <message> <location filename="xsettingsui.ui" line="101"/> @@ -2663,12 +2663,12 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="xsettingsui.ui" line="113"/> <source>command line options:</source> - <translation>Kommandolinie parametre:</translation> + <translation>Kommandolinje parametre:</translation> </message> <message> <location filename="xsettingsui.ui" line="125"/> <source>X-Server command line options</source> - <translation>X-Server Kommandolinie parametre</translation> + <translation>X-Server Kommandolinje parametre</translation> </message> <message> <location filename="xsettingsui.ui" line="131"/> hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-32-gd34d365
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via d34d3656f53de76f961f5c85feb1882b98effab8 (commit) from 2d2e2c3685328c07d340347923a5bb1bb4e73423 (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 d34d3656f53de76f961f5c85feb1882b98effab8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 13:08:19 2012 +0200 add forgotten files for X2Go::Server package ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2gologlevel => X2Go/Server.pm | 17 ++++++++++++++--- debian/libx2go-server-perl.install | 2 ++ 2 files changed, 16 insertions(+), 3 deletions(-) copy x2goserver/lib/x2gologlevel => X2Go/Server.pm (86%) mode change 100755 => 100644 create mode 100644 debian/libx2go-server-perl.install The diff of changes is: diff --git a/x2goserver/lib/x2gologlevel b/X2Go/Server.pm old mode 100755 new mode 100644 similarity index 86% copy from x2goserver/lib/x2gologlevel copy to X2Go/Server.pm index 5d5c49e..17a07cc --- a/x2goserver/lib/x2gologlevel +++ b/X2Go/Server.pm @@ -20,8 +20,19 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -use strict; +package X2Go::Server; + +=head1 NAME + +X2Go::Server - X2Go Server package for Perl + +=head1 DESCRIPTION -use X2Go::Log qw(loglevel); +X2Go::Server Perl package. + +=cut + +use strict; +use base 'Exporter'; -print loglevel(); +1; diff --git a/debian/libx2go-server-perl.install b/debian/libx2go-server-perl.install new file mode 100644 index 0000000..e534e19 --- /dev/null +++ b/debian/libx2go-server-perl.install @@ -0,0 +1,2 @@ +usr/share/perl5/X2Go/Server.pm +usr/share/man/man3/X2Go::Server.* \ No newline at end of file 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-31-g2d2e2c3
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 2d2e2c3685328c07d340347923a5bb1bb4e73423 (commit) from d10d2cc695a7615666aec6e929adc9e995a2efac (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 2d2e2c3685328c07d340347923a5bb1bb4e73423 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 13:05:40 2012 +0200 fix in perldoc template ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index b9db12f..ea33b6a 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -22,7 +22,7 @@ package X2Go::Server::DB; =head1 NAME -X2Go::DB - X2Go Session Database package for Perl +X2Go::Server::DB - X2Go Session Database package for Perl =head1 DESCRIPTION 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-30-gd10d2cc
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via d10d2cc695a7615666aec6e929adc9e995a2efac (commit) from 4107f0d839e4eb2fc1eb4e6d6aee06fe5cd5116d (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 d10d2cc695a7615666aec6e929adc9e995a2efac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 12:53:26 2012 +0200 fix package name in X2Go::Server::DB ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index dfee6bb..b9db12f 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -18,7 +18,7 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -package X2Go::DB; +package X2Go::Server::DB; =head1 NAME 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-29-g4107f0d
by git-admin＠x2go.org 17 Sep '12

17 Sep '12

The branch, master has been updated via 4107f0d839e4eb2fc1eb4e6d6aee06fe5cd5116d (commit) from bbb685fb33fa0271a11902db8a167989e5bd72ea (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 4107f0d839e4eb2fc1eb4e6d6aee06fe5cd5116d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 17 12:37:28 2012 +0200 we do not provide Perl modules, we provide packages ----------------------------------------------------------------------- Summary of changes: X2Go/Log.pm | 4 ++-- X2Go/Server/DB.pm | 4 ++-- debian/control | 26 ++++++++++++++++++++++---- debian/libx2go-log-perl.install | 2 +- debian/libx2go-server-db-perl.install | 2 +- 5 files changed, 28 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/X2Go/Log.pm b/X2Go/Log.pm index d62c556..ec08dd2 100644 --- a/X2Go/Log.pm +++ b/X2Go/Log.pm @@ -24,11 +24,11 @@ package X2Go::Log; =head1 NAME -X2Go::Log - X2Go Logging modules for Perl +X2Go::Log - X2Go Logging package for Perl =head1 DESCRIPTION -X2Go Log module X2Go components. +X2Go::Log Perl package for X2Go components. =cut diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index 6a27db0..dfee6bb 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -22,11 +22,11 @@ package X2Go::DB; =head1 NAME -X2Go::DB - X2Go Session Database modules for Perl +X2Go::DB - X2Go Session Database package for Perl =head1 DESCRIPTION -X2Go Session Database modules for X2Go Server. +X2Go::Server::DB Perl package for X2Go::Server. =cut diff --git a/debian/control b/debian/control index b845951..8b04e77 100644 --- a/debian/control +++ b/debian/control @@ -13,13 +13,31 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: libx2go-server-perl +Architecture: any +Section: perl +Depends: + ${perl:Depends}, + ${misc:Depends}, +Description: Perl X2Go::Server package + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains the X2Go::Server Perl package. + Package: libx2go-server-db-perl Architecture: any Section: perl Depends: ${perl:Depends}, ${misc:Depends}, -Description: Perl X2Go::Server:DB modules + libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), +Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -28,7 +46,7 @@ Description: Perl X2Go::Server:DB modules - audio support - authentication by smartcard and USB stick . - This package contains the X2Go::Server::DB Perl modules. + This package contains the X2Go::Server::DB Perl package. Package: libx2go-log-perl Architecture: any @@ -36,7 +54,7 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, -Description: Perl X2Go::Log modules +Description: Perl X2Go::Log package X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -45,7 +63,7 @@ Description: Perl X2Go::Log modules - audio support - authentication by smartcard and USB stick . - This package contains the X2Go::Log Perl module. + This package contains the X2Go::Log Perl package. Package: x2goserver Architecture: any diff --git a/debian/libx2go-log-perl.install b/debian/libx2go-log-perl.install index ce1fadc..295238a 100644 --- a/debian/libx2go-log-perl.install +++ b/debian/libx2go-log-perl.install @@ -1,2 +1,2 @@ usr/share/perl5/X2Go/Log.pm -usr/share/man/man3/X2Go::Log* \ No newline at end of file +usr/share/man/man3/X2Go::Log.* \ No newline at end of file diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install index dd30db9..90a73ea 100644 --- a/debian/libx2go-server-db-perl.install +++ b/debian/libx2go-server-db-perl.install @@ -1,2 +1,2 @@ usr/share/perl5/X2Go/Server/DB* -usr/share/man/man3/X2Go::Server::DB* \ No newline at end of file +usr/share/man/man3/X2Go::Server::DB.* \ No newline at end of file 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).

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2012