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]bin/x2gomountdirs | 1 +
x2goserver/lib/x2godbwrapper.pm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 1b62543..9f93e50 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -247,6 +247,7 @@ for (my $i=0;$i<@dirs;$i++)
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)
{
print "mount @dirs[$i] ok\n";
+ syslog('notice', "successfully mounted $user\@$user:@dirs[$i] to $mntpath");
# check if kde4 plasmoid running
my $useplasmoid=0;
if ( -e $plasmstamp )
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index e586cf9..cf514e4 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -437,7 +437,7 @@ sub db_getports
}
if ($backend eq 'sqlite')
{
- $ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
+ @ports = split("\n",`$x2go_lib_path/x2gosqlitewrapper getports $server`);
}
my $log_retval = join(" ", @ports);
syslog('debug', "db_getports called, server: $server; return value: $log_retval");
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]
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]bin/x2gocmdexitmessage | 4 ++++
1 file changed, 4 insertions(+)
The diff of changes is:
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index 43dbf0f..8c96e92 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -20,8 +20,12 @@
# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de>
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
X2GO_ROOT=${HOME}/.x2go
MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)"
+
# return command output of the command that was issued by x2goruncommand
cat $MESSAGE_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).
[View Less]
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]
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]bin/x2gomountdirs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 01de053..6f73514 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -243,9 +243,9 @@ for (my $i=0;$i<@dirs;$i++)
{
$code_conv="-o $code_conv";
}
- $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";
+ $msg = "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";
+ syslog('debug', "executing: $msg");
+ print "inserted, $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";
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]
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]bin/x2gomountdirs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 6f73514..8396f42 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -272,19 +272,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");
+ syslog('debug', "creating desktop icon for @dirs[$i], media 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");
+ syslog('debug', "creating desktop icon for @dirs[$i], media type is: optical disc");
}
else
{
$fname="$fname(sshfs-removable)";
- syslog('debug', "@dirs[$i] mounted, mount point type is: removable device");
+ syslog('debug', "creating desktop icon for @dirs[$i], media type is: removable device");
}
$fname=~s/_ramdrive_mnt_//;
}
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]
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]
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]
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]bin/x2gomountdirs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 9f93e50..d304a71 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -247,7 +247,7 @@ for (my $i=0;$i<@dirs;$i++)
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)
{
print "mount @dirs[$i] ok\n";
- syslog('notice', "successfully mounted $user\@$user:@dirs[$i] to $mntpath");
+ syslog('notice', "successfully mounted $user\@$host:@dirs[$i] to $mntpath");
# check if kde4 plasmoid running
my $useplasmoid=0;
if ( -e $plasmstamp )
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]
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]changelog | 2 ++
x2goserver/lib/x2godbwrapper.pm | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7f597df..6d3801e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Add debugging support for almost all DB functions in x2godbwrapper.pm, fix
for Syslog module initialization in all Perl scripts.
* 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.
[ Martin Oehler ]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index 6ce0cd1..bce67d3 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -30,9 +30,6 @@ my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2gologlevel;
-openlog($0,'cons,pid','user');
-setlogmask( LOG_UPTO(x2gologlevel()) );
-
my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid());
@@ -587,6 +584,3 @@ sub db_listsessions_all
return split("\n",`$x2go_lib_path/x2gosqlitewrapper listsessions_all`);
}
}
-
-# closing syslog
-closelog;
\ 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).
[View Less]