x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-237-ga19542b
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via a19542ba478f9c2968af3470f3af5033affb34ec (commit) from a4838ac43b89a0136978c29ddc7468eb42c691f0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]lib/x2godbwrapper.pm | 48 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index bce67d3..e586cf9 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -168,7 +168,7 @@ sub dbsys_listsessionsroot_all sub dbsys_getmounts { - my $mounts; + my @mounts; my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { @@ -184,20 +184,20 @@ sub dbsys_getmounts } $sth->finish(); $dbh->disconnect(); - $mounts = @strings; + @mounts = @strings; } if ($backend eq 'sqlite') { - $mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + @mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } - my $log_retval = join(" ", $mounts); + my $log_retval = join(" ", @mounts); syslog('debug', "dbsys_getmounts called, session ID: $sid; return value: $log_retval"); - return $mounts + return @mounts; } sub db_getmounts { - my $mounts; + my @mounts; my $sid=shift or die "argument \"session_id\" missed"; if($backend eq 'postgres') { @@ -213,15 +213,15 @@ sub db_getmounts } $sth->finish(); $dbh->disconnect(); - $mounts = @strings; + @mounts = @strings; } if ($backend eq 'sqlite') { - $mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); + @mounts = split("\n",`$x2go_lib_path/x2gosqlitewrapper getmounts $sid`); } - my $log_retval = join(" ", $mounts); + my $log_retval = join(" ", @mounts); syslog('debug', "db_getmounts called, session ID: $sid; return value: $log_retval"); - return $mounts + return @mounts; } sub db_deletemount @@ -386,7 +386,7 @@ sub db_changestatus sub db_getdisplays { - my $displays; + my @displays; #ignore $server my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') @@ -403,20 +403,20 @@ sub db_getdisplays } $sth->finish(); $dbh->disconnect(); - $displays = @strings; + @displays = @strings; } if ($backend eq 'sqlite') { - $displays = split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); + @displays = split("\n",`$x2go_lib_path/x2gosqlitewrapper getdisplays $server`); } - my $log_retval = join(" ", $displays); + my $log_retval = join(" ", @displays); syslog('debug', "db_getdisplays called, server: $server; return value: $log_retval"); - return $displays; + return @displays; } sub db_getports { - my $ports; + my @ports; #ignore $server my $server=shift or die "argument \"server\" missed"; if ($backend eq 'postgres') @@ -433,20 +433,20 @@ sub db_getports } $sth->finish(); $dbh->disconnect(); - $ports = @strings; + @ports = @strings; } if ($backend eq 'sqlite') { $ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`); } - my $log_retval = join(" ", $ports); + my $log_retval = join(" ", @ports); syslog('debug', "db_getports called, server: $server; return value: $log_retval"); - return $ports; + return @ports; } sub db_getservers { - my $servers; + my @servers; if ($backend eq 'postgres') { my @strings; @@ -461,15 +461,15 @@ sub db_getservers } $sth->finish(); $dbh->disconnect(); - $servers = @strings; + @servers = @strings; } if ($backend eq 'sqlite') { - $servers = split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); + @servers = split("\n",`$x2go_lib_path/x2gosqlitewrapper getservers`); } - my $log_retval = join(" ", $servers); + my $log_retval = join(" ", @servers); syslog('debug', "db_getservers called, return value: $log_retval"); - return $servers; + return @servers; } sub db_getagent 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). [View Less]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-238-g05cf570
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 05cf570b013f706490bdc170f4b315a208048d70 (commit) from a19542ba478f9c2968af3470f3af5033affb34ec (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-235-geaf5a69
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via eaf5a69eb51514fa7abb2ddf0647ae9330d18c67 (commit) from 085bdb5442060de5079a9e6aae6672db880051ee (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-234-g085bdb5
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 085bdb5442060de5079a9e6aae6672db880051ee (commit) from dbf158d78a69c3affe60cde8e9c3488fe0ae78e5 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + x2goserver-extensions/bin/x2gosetkeyboard | 4 ++++ x2goserver-extensions/bin/x2goversion | 4 ++++ 3 files changed, 9 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d3801e..3982892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add info loglevel messages for all scripts in bin dir. * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a package. This has to be done by the scripts that use x2godbwrapper.pm. + * Add info loglevel messages for x2goserver-extensions scripts. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard index 6f2fc6f..4073fa9 100755 --- a/x2goserver-extensions/bin/x2gosetkeyboard +++ b/x2goserver-extensions/bin/x2gosetkeyboard @@ -22,6 +22,10 @@ set -e +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + # set up paths X2GO_SESSION_ROOT=${HOME}/.x2go X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION} diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion index b777625..ecc11d1 100755 --- a/x2goserver-extensions/bin/x2goversion +++ b/x2goserver-extensions/bin/x2goversion @@ -20,6 +20,10 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions" get_version() { 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). [View Less]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-242-gd9f094d
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via d9f094dab274b1c8504b265f816c3aa78382ee70 (commit) from 008dc9bd85ba96ffa5debf05a0ccaa70c91971a3 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-243-gcd6bdab
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via cd6bdabf7faba4899b98466d2671776461819c40 (commit) from d9f094dab274b1c8504b265f816c3aa78382ee70 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-236-ga4838ac
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via a4838ac43b89a0136978c29ddc7468eb42c691f0 (commit) from eaf5a69eb51514fa7abb2ddf0647ae9330d18c67 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + x2goserver/bin/x2gomountdirs | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3982892..dba9904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a package. This has to be done by the scripts that use x2godbwrapper.pm. * Add info loglevel messages for x2goserver-extensions scripts. + * Add debug messages to x2gomountdirs script. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 3ca2504..1b62543 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -38,6 +38,7 @@ my $session=shift; my $user=shift; my $key=shift; my @dl; +my $msg; my $i=0; @dl[$i]=shift; while(@dl[$i]) @@ -199,12 +200,14 @@ for (my $i=0;$i<@dirs;$i++) @dirs[$i]=~s/__PRINT_SPOOL_//; $printspool=1; $mntpath=$spooldir; + syslog('debug', "mounting $spooldir, mount point type is print spool directory"); } elsif(@dirs[$i]=~m/__MIMEBOX_SPOOL_/) { @dirs[$i]=~s/__MIMEBOX_SPOOL_//; $mimeboxspool=1; $mntpath=$mimeboxdir; + syslog('debug', "mounting $mimeboxdir, mount point type is MIME box directory"); } else { @@ -266,16 +269,19 @@ for (my $i=0;$i<@dirs;$i++) if ($type eq "dir") { $fname="$fname(sshfs-disk)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: client-side folder on harddrive"); } else { if ($fname =~ m/CDROM/) { $fname="$fname(sshfs-cdrom)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: optical disc"); } else { $fname="$fname(sshfs-removable)"; + syslog('debug', "@dirs[$i] mounted, mount point type is: removable device"); } $fname=~s/_ramdrive_mnt_//; } @@ -287,14 +293,18 @@ for (my $i=0;$i<@dirs;$i++) } else { - print "mount @dirs[$i] failed\n"; + $msg = "mounting of @dirs[$i] failed"; + print "$msg\n"; + syslog('warn', "WARNING: $msg"); db_deletemount( $session, $mntpath); rmdir($mntpath); } } else { - print "insertion failed(already mounted?), not mounting\n"; + $msg = "insertion of @dirs[$i] failed (already mounted?), not mounting"; + syslog('warn', "WARNING: $msg"); + print "$msg\n"; } } 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). [View Less]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-241-g008dc9b
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 008dc9bd85ba96ffa5debf05a0ccaa70c91971a3 (commit) from ed73eb94ef82101ea74e1a4772d44b8ffbd231e5 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + x2goserver/bin/x2gomountdirs | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dba9904..5abbf38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low package. This has to be done by the scripts that use x2godbwrapper.pm. * Add info loglevel messages for x2goserver-extensions scripts. * Add debug messages to x2gomountdirs script. + * Use usermapping for SSHFS mount points. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 7dadf29..01de053 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -243,8 +243,10 @@ for (my $i=0;$i<@dirs;$i++) { $code_conv="-o $code_conv"; } - print "inserted,\nsshfs $code_conv -o IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port\n"; - if (system("sshfs $code_conv -o ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + $msg = "inserted,\nsshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; + syslog('debug', "$msg"); + print "$msg\n"; + if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); 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). [View Less]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-239-g68e6582
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 68e65827c07f34df6cf0dc5f782e941c237134f0 (commit) from 05cf570b013f706490bdc170f4b315a208048d70 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/… [View More]

1 0

x2goserver.git - build-baikal (branch) updated: 3.0.99-2-232-gddcb395
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via ddcb3950ca7df0790a328acbfbaf9fe462fff83b (commit) from b8c1e92197897609a27f7c13ccc2b30bb993a373 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2014