[X2Go-Commits] [x2goserver] branch master updated (57fc0a9 -> ef7dc6a)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goserver.

  from  57fc0a9   x2goserver/man/man8/x2gocleansessions.8: drop obsolete 
man page.
   new  ef7dc6a   Unset LD_LIBRARY_PATH for the case when x2gostartagent 
started from x2godesktopsharing.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |1 +
 x2goserver/bin/x2gostartagent |2 ++
 2 files changed, 3 insertions(+)

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/01: Unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit ef7dc6a3ce512e7a1eedd5043ff3173f2384b56f
Author: Oleksandr Shneyder 
Date:   Thu Aug 11 15:46:18 2016 +0200

Unset LD_LIBRARY_PATH for the case when x2gostartagent started from 
x2godesktopsharing.
---
 debian/changelog  |1 +
 x2goserver/bin/x2gostartagent |2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 974914f..e50ba19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,6 +159,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
   * New upstream version (4.1.0.0):
 - Fix x2godbadmin. Set right column name "tekidata_port" in create table.
   (Fixes: #557).
+- Unset LD_LIBRARY_PATH for the case when x2gostartagent started from 
x2godesktopsharing.
 
   [ Mark Pederson-Cook ]
   * debian/po:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 228d227..c6cfd4e 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -458,6 +458,8 @@ if [ -n "$X2GO_GEOMETRY" ] && [ "$X2GO_GEOMETRY" != 
"fullscreen" ]; then
 fi
 
 if  [ "$X2GO_STYPE" == "S" ]; then
+   # unset LD_LIBRARY_PATH for the case when x2gostartagent started from 
x2godesktopsharing
+   unset LD_LIBRARY_PATH
# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is 
in use
NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ 
-$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode 
$SHADOW_MODE $agent_geometry -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 
2>"${SESSION_LOG}" &
 else

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 03/05: src/unixhelper.h: style and general fixes within comments.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 40b9683514478dc496f29f5dea953b3d7abce853
Author: Mihai Moldovan 
Date:   Fri Aug 12 09:06:32 2016 +0200

src/unixhelper.h: style and general fixes within comments.
---
 debian/changelog |1 +
 src/unixhelper.h |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12f241b..3610ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -393,6 +393,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   startup issue on Windows.
 - src/pulsemanager.cpp: fix PA version fetching on OS X again.
 - src/unixhelper.{cpp,h}: make argument of kill_pgroup () const.
+- src/unixhelper.h: style and general fixes within comments.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/unixhelper.h b/src/unixhelper.h
index 3c2798f..d67f3ed 100644
--- a/src/unixhelper.h
+++ b/src/unixhelper.h
@@ -29,7 +29,7 @@
 namespace unixhelper {
   /*
* Unblocks all signals and installs a signal handler for SIGHUP,
-   * which calls kill_pgroup().
+   * which calls kill_pgroup ().
*
* Should signal unblocking or installing the signal handler fail,
* an emergency exit is performed and
@@ -42,7 +42,7 @@ namespace unixhelper {
*
* In this loop, the current parent PID is polled and compared against
* the original value passed via parameter parent.
-   * Should they mismatch, the parent died and kill_pgroup() is called.
+   * Should they mismatch, the parent died and kill_pgroup () is called.
*/
   int unix_cleanup (const pid_t parent);
 
@@ -60,6 +60,7 @@ namespace unixhelper {
*  group leader dies under specific circumstances
*  (we cannot rely that this always happens, though,
*   so a polling solution is needed, see unix_cleanup().)
+   * Other values are not handled.
*/
   void kill_pgroup (const int signal);
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] branch release/4.0.1.x updated (cae9ba3 -> 65e9b8c)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.0.1.x
in repository x2goserver.

  from  cae9ba3   x2goserver/man/man8/x2gocleansessions.8: drop obsolete 
man page.
   new  f8c89a6   x2goserver-xsession/etc/Xsession: fix uname calls when 
(potentially) creating session log/error file and add uname call where 
necessary.
   new  ccf305c   x2goserver-xsession/etc/Xsession: include hostname in 
session-x2go-errors file name. Part of #923.
   new  aa29e1e   x2goserver.spec: add new dependency on perl and the Cwd 
module to x2goserver-xsession. Part of #923.
   new  ad7e210   debian/control: add new dependency on perl-modules for 
Cwd. Part of #923.
   new  65e9b8c   x2goserver-xsession/etc/Xsession: rotate old log/error 
file before appending new data. Fixes: #923.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |9 +
 debian/control   |3 ++-
 x2goserver-xsession/etc/Xsession |   25 -
 x2goserver.spec  |   12 
 4 files changed, 43 insertions(+), 6 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 02/05: x2goserver-xsession/etc/Xsession: include hostname in session-x2go-errors file name. Part of #923.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit ccf305c8184f3aeb3c1282154c16a2a497c6f60a
Author: Mihai Moldovan 
Date:   Sat Aug 13 03:11:23 2016 +0200

x2goserver-xsession/etc/Xsession: include hostname in session-x2go-errors 
file name. Part of #923.
---
 debian/changelog |2 ++
 x2goserver-xsession/etc/Xsession |   11 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c36f85e..0027582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
 - x2goserver/man/man8/x2gocleansessions.8: drop obsolete man page.
 - x2goserver-xsession/etc/Xsession: fix uname calls when (potentially)
   creating session log/error file and add uname call where necessary.
+- x2goserver-xsession/etc/Xsession: include hostname in
+  xsession-x2go-errors file name. Part of #923.
   * x2goserver.spec:
 - Add sudo and logcheck as BuildRequires and Requires. Don't own
   directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 5bfc60a..81264a0 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -59,6 +59,11 @@ for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" 
"$HOME/.xprofile"; d
fi
 done
 
+cur_hostname="$(hostname)"
+if [ -z "${cur_name}" ] || [ "${cur_hostname}" = "(none)" ] || [ 
"${cur_hostname}" = "localhost" ]; then
+   errormsg "Hostname not set correctly; aborting."
+fi
+
 # initialize variables for use by all session scripts
 
 OPTIONFILE=/etc/x2go/Xsession.options
@@ -70,14 +75,14 @@ SYSSESSIONDIR=/etc/x2go/Xsession.d
 USERXSESSION=$HOME/.xsession-x2go
 USERXSESSIONRC=$HOME/.xsessionrc-x2go
 ALTUSERXSESSION=$HOME/.Xsession-x2go
-ERRFILE=$HOME/.xsession-x2go-errors
+ERRFILE="${HOME}/.xsession-x2go-${cur_hostname}-errors"
 
 # attempt to create an error file; abort if we cannot
 if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L 
"$ERRFILE" ]; then
chmod 600 "$ERRFILE"
 elif ERRFILE=$(umask 077 && mktemp 2> /dev/null); then
-   if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then
-   message "warning: unable to symlink 
\"$TMPDIR/xsession-x2go-$USER\" to" \
+   if ! ln -sf "$ERRFILE" 
"${TMPDIR:=/tmp}/xsession-x2go-${cur_hostname}-$USER"; then
+   message "warning: unable to symlink 
\"$TMPDIR/xsession-x2go-${cur_hostname}-$USER\" to" \
"\"$ERRFILE\"; look for session log/errors in" \
"\"$TMPDIR/xsession-x2go-$USER\"."
fi

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/05: x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) creating session log/error file and add uname call where necessary.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 6471448dcf26876067f9f7c52f0a3f47c6de8078
Author: Mihai Moldovan 
Date:   Sat Aug 13 03:14:47 2016 +0200

x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) 
creating session log/error file and add uname call where necessary.

Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog |2 ++
 x2goserver-xsession/etc/Xsession |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e50ba19..aee1dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -317,6 +317,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
   -h, -? and --man options. Fixes: #1065. Also print a usage message on
   unknown options.
 - x2goserver/man/man8/x2gocleansessions.8: drop obsolete man page.
+- x2goserver-xsession/etc/Xsession: fix uname calls when (potentially)
+  creating session log/error file and add uname call where necessary.
   * x2goserver.spec:
 - Add sudo and logcheck as BuildRequires and Requires. Don't own
   directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 7ad477f..5bfc60a 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -73,9 +73,9 @@ ALTUSERXSESSION=$HOME/.Xsession-x2go
 ERRFILE=$HOME/.xsession-x2go-errors
 
 # attempt to create an error file; abort if we cannot
-if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L 
"$ERRFILE" ]; then
+if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L 
"$ERRFILE" ]; then
chmod 600 "$ERRFILE"
-elif ERRFILE=$(mktemp 2> /dev/null); then
+elif ERRFILE=$(umask 077 && mktemp 2> /dev/null); then
if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then
message "warning: unable to symlink 
\"$TMPDIR/xsession-x2go-$USER\" to" \
"\"$ERRFILE\"; look for session log/errors in" \

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/01: x2goserver-xsession/etc/Xsession: fix wrong variable usage. Fixes: #1073.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 3b792a7a028bb51a0b646563da883e1e00cec29e
Author: Mihai Moldovan 
Date:   Sat Aug 13 23:46:53 2016 +0200

x2goserver-xsession/etc/Xsession: fix wrong variable usage. Fixes: #1073.

Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog |2 ++
 x2goserver-xsession/etc/Xsession |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f424215..c33fe81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -323,6 +323,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
   xsession-x2go-errors file name. Part of #923.
 - x2goserver-xsession/etc/Xsession: rotate old log/error file before
   appending new data. Fixes: #923.
+- x2goserver-xsession/etc/Xsession: fix wrong variable usage.
+  Fixes: #1073.
   * x2goserver.spec:
 - Add sudo and logcheck as BuildRequires and Requires. Don't own
   directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 2bf3e33..52a61bf 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -60,7 +60,7 @@ for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" 
"$HOME/.xprofile"; d
 done
 
 cur_hostname="$(hostname)"
-if [ -z "${cur_name}" ] || [ "${cur_hostname}" = "(none)" ] || [ 
"${cur_hostname}" = "localhost" ]; then
+if [ -z "${cur_hostname}" ] || [ "${cur_hostname}" = "(none)" ] || [ 
"${cur_hostname}" = "localhost" ]; then
errormsg "Hostname not set correctly; aborting."
 fi
 

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [pyhoca-cli] 01/01: man/man1/pyhoca-cli.1: drop incorrect short option -p as an alias for --pack. Fixes: #1062.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-cli.

commit 9428156ce19265ad3172fa21cb81a6e075109723
Author: Mihai Moldovan 
Date:   Sun Aug 7 18:49:11 2016 +0200

man/man1/pyhoca-cli.1: drop incorrect short option -p as an alias for 
--pack. Fixes: #1062.

-p is already used as the short option for --remote-ssh-port.
---
 debian/changelog  |3 +++
 man/man1/pyhoca-cli.1 |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 66690ae..4469486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ pyhoca-cli (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
 
   [ Mihai Moldovan ]
   * New upstream version (0.5.0.4):
+- man/man1/pyhoca-cli.1: drop incorrect short option -p as an alias for
+  --pack. Fixes: #1062. -p is already used as the short option for
+  --remote-ssh-port.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index e7fa548..c24b6b7 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -195,7 +195,7 @@ Session type (default: 'application'). Note: there are also 
some auto-detection
 feature for the session type built into the code.
 It might not always happen what you expect from setting this option.
 .TP
-\*(T<\fB\-p, \-\-pack\fR \fI\fR\*(T>
+\*(T<\fB\-\-pack\fR \fI\fR\*(T>
 Compression method (see below for possible values).
 .TP
 \*(T<\fB\-\-kbd\-layout\fR \fI{us|de|fr|...}\fR\*(T>

--
Alioth's /srv/git/code.x2go.org/pyhoca-cli.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/pyhoca-cli.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/02: x2goserver/sbin/x2gocleansessions: add Perl documentation and --help, -h, -? and --man options. Fixes: #1065.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 39e369dd08ba3e25263a51fdb230e7e88a13520b
Author: Mihai Moldovan 
Date:   Sun Aug 7 20:06:53 2016 +0200

x2goserver/sbin/x2gocleansessions: add Perl documentation and --help, -h, 
-? and --man options. Fixes: #1065.

Also print a usage message on unknown options.
---
 debian/changelog  |3 +++
 x2goserver/sbin/x2gocleansessions |   51 +
 2 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c0635e1..a477aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,6 +82,9 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
   OpenSSH server versions seem to disable the Blowfish cipher by default,
   leading to errors like "Connection reset by peer."
 - x2goserver/bin/x2goruncommand: whitespace only.
+- x2goserver/sbin/x2gocleansessions: add Perl documentation and --help,
+  -h, -? and --man options. Fixes: #1065. Also print a usage message on
+  unknown options.
   * x2goserver.spec:
 - Add sudo and logcheck as BuildRequires and Requires. Don't own
   directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver/sbin/x2gocleansessions 
b/x2goserver/sbin/x2gocleansessions
index 00cb43e..7428b66 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -30,6 +30,57 @@ use Capture::Tiny qw ( :all );
 my $x2go_lib_path=`x2gopath libexec`;
 use lib `x2gopath lib`;
 use x2gologlevel;
+use Getopt::Long;
+use Pod::Usage;
+
+Getopt::Long::Configure("gnu_getopt", "no_auto_abbrev");
+
+my $help = 0;
+my $man = 0;
+GetOptions('help|?|h' => \$help, 'man' => \$man) or pod2usage(2);
+pod2usage(1) if $help;
+pod2usage(-verbose => 2, -exitval => 0) if $man;
+
+__END__
+=head1 NAME
+
+x2gocleansessions - X2Go Server Cleanup Daemon
+
+=head1 SYNOPSIS
+
+x2gocleansessions [options]
+
+  Options:
+--help|-h|-?brief help message
+--man   full documentation
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--help>|B<-?>|B<-h>
+
+Print a brief help message and exits.
+
+=item B<--man>
+
+Prints the manual page and exits.
+
+=back
+
+=head1 DESCRIPTION
+
+B is run as a service on X2Go servers to handle the cleanup
+of stale sessions.
+
+B must be run (as a service) with root privileges.
+
+=head1 AUTHOR
+
+This manual has been written by Mike Gabriel 
+for the X2Go project (http://www.x2go.org).
+
+=cut
 
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] branch release/4.0.1.x updated (e912bfa -> cae9ba3)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.0.1.x
in repository x2goserver.

  from  e912bfa   debian/control: add myself as uploader.
   new  39e369d   x2goserver/sbin/x2gocleansessions: add Perl documentation 
and --help, -h, -? and --man options. Fixes: #1065.
   new  cae9ba3   x2goserver/man/man8/x2gocleansessions.8: drop obsolete 
man page.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|4 +++
 x2goserver/man/man8/x2gocleansessions.8 |   23 --
 x2goserver/sbin/x2gocleansessions   |   51 +++
 3 files changed, 55 insertions(+), 23 deletions(-)
 delete mode 100644 x2goserver/man/man8/x2gocleansessions.8

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/14: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit e8d67c456d5a66ddd7415764b333bbf1cd3531d5
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:15:38 2017 +0100

src/sshmasterconnection.cpp: replace string_free () with its successor 
ssh_string_free ().

Will break on ancient systems, but we don't care.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ab5abb2..2e09217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -568,6 +568,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   ssh_get_hexa (). This will break on very old systems with a hopelessly
   outdated libssh version, but we do not care about these systems in the
   first place.
+- src/sshmasterconnection.cpp: replace string_free () with its successor
+  ssh_string_free (). Will break on ancient systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 99e35df..57ca78c 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1192,7 +1192,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
 privatekey_free(prkey);
-string_free(pubkeyStr);
+ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
 x2goDebug<<"Authenticating with key: "<

[X2Go-Commits] [x2goclient] 01/14: src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () (0.7.4 and higher) or ssh_get_publickey () (0.7.3 and lo

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 0b9f1403b6fe740249f5e60f6a769e568b595eb6
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:08:43 2017 +0100

src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public 
key via ssh_get_server_publickey () (0.7.4 and higher) or ssh_get_publickey () 
(0.7.3 and lower) and its hash via ssh_get_publickey_hash () instead of using 
the deprecated ssh_get_pubkey_hash () function.

Additionally, replace free () with the more appropriate
ssh_string_free_char () function after using ssh_get_hexa ().

This will break on very old systems with a hopelessly outdated libssh
version, but we do not care about these systems in the first place.
---
 debian/changelog|9 +
 src/sshmasterconnection.cpp |   40 +---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 438f75f..ab5abb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -559,6 +559,15 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   commit. Fixes compile issues on Linux and other systems.
 - src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
   of ssh_forward_listen () for newer libssh versions. Fixes: #870.
+- src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public
+  key via ssh_get_server_publickey () (0.7.4 and higher) or
+  ssh_get_publickey () (0.7.3 and lower) and its hash via
+  ssh_get_publickey_hash () instead of using the deprecated
+  ssh_get_pubkey_hash () function. Additionally, replace free () with the
+  more appropriate ssh_string_free_char () function after using
+  ssh_get_hexa (). This will break on very old systems with a hopelessly
+  outdated libssh version, but we do not care about these systems in the
+  first place.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index b3f9aa3..99e35df 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -20,6 +20,7 @@
 #include "sshmasterconnection.h"
 #include 
 #include 
+#include 
 #include "sshprocess.h"
 
 
@@ -812,22 +813,47 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
 x2goDebug<<"cserverAuth";
 #endif
 
-int state, hlen;
+int state = SSH_SERVER_ERROR;
 unsigned char *hash = NULL;
-char *hexa;
+char *hexa = NULL;
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+ssh_key srv_pubkey = { 0 };
+int rc = SSH_ERROR;
+size_t hlen = 0;
+#else
+int hlen = 0;
+#endif
 
 state = ssh_is_server_known ( my_ssh_session );
-hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
 
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4)
+rc = ssh_get_server_publickey (my_ssh_session, _pubkey);
+#else /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4) */
+rc = ssh_get_publickey (my_ssh_session, _pubkey);
+#endif /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4) */
+
+if (SSH_OK != rc) {
+return (SSH_SERVER_ERROR);
+}
+
+rc = ssh_get_publickey_hash (srv_pubkey, SSH_PUBLICKEY_HASH_SHA1, , 
);
+ssh_key_free (srv_pubkey);
 
-if ( hlen < 0 )
+if (0 != rc) {
+return (SSH_SERVER_ERROR);
+}
+#else
+hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
+#endif
+
+if ( 0 >= hlen )
 return SSH_SERVER_ERROR;
 
 #ifdef DEBUG
 x2goDebug<<"state: "<

[X2Go-Commits] [x2goclient] 06/14: src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit d9ee9650106c634cc8819bb9e9bd2b9f1999ec85
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:52:29 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_request_exec () 
function with ssh_channel_request_exec ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea45c87..d8e3c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -579,6 +579,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
   function with ssh_channel_open_session (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
+  function with ssh_channel_request_exec (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index d671d35..8417d34 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1611,11 +1611,11 @@ void SshMasterConnection::channelLoop()
 x2goDebug<

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (2b7f608 -> 9aa514c)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  discards  2b7f608   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
  discards  7954adb   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
  discards  179dd39   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
  discards  96ad7a6   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
  discards  e210fa3   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
  discards  775718f   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
  discards  b3c2f85   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
  discards  a07327f   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
  discards  84d6b42   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
  discards  78bcfce   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
  discards  6a9f84b   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
  discards  c8924ec   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
  discards  8ac36d5   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
  discards  0aa484b   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.
   new  0b9f140   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () (0.7.4 and higher) or 
ssh_get_publickey () (0.7.3 and lower) and its hash via ssh_get_publickey_hash 
() instead of using the deprecated ssh_get_pubkey_hash () function.
   new  e8d67c4   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
   new  a23a3db   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
   new  d5edf53   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
   new  456c140   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
   new  d9ee965   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
   new  bc6dd6e   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
   new  5b3e174   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
   new  7e87053   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
   new  1920cfd   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
   new  b53ea01   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
   new  bfbc01f   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
   new  58ff99d   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
   new  9aa514c   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2b7f608)
\
 N -- N -- N   refs/heads/feature/libssh-api-upgrade (9aa514c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 

[X2Go-Commits] [x2goclient] 13/14: src/sshmasterconnection.cpp: replace deprecated channel_free () function with ssh_channel_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 58ff99d58fad59b51f2994cacba3fa4e05859323
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:14:56 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_free () function 
with ssh_channel_free ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 564228a..40aaf89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -600,6 +600,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_close ()
   function with ssh_channel_close (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_free () function
+  with ssh_channel_free (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index fc7c069..21ab275 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1801,7 +1801,7 @@ void SshMasterConnection::finalize ( int item )
 #ifdef DEBUG
 x2goDebug<<"Channel closed.";
 #endif
-channel_free ( channel );
+ssh_channel_free ( channel );
 }
 if ( tcpSocket>0 )
 {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 08/14: src/sshmasterconnection.cpp: replace deprecated channel_read () function with ssh_channel_read ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 5b3e174335e45e4f02407d9f532ab2ab63ce31c2
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:06:22 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_read () function 
with ssh_channel_read ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25e0fb0..daea092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -585,6 +585,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_poll () function
   with ssh_channel_poll (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_read () function
+  with ssh_channel_read (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index babd71a..5828d0f 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1662,7 +1662,7 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
 #endif
-nbytes = channel_read ( channel, buffer, sizeof ( buffer )-1, 
1 );
+nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer 
)-1, 1 );
 emit stdErr ( channelConnections[i].creator, QByteArray ( 
buffer,nbytes ) );
 #ifdef DEBUG
 //  x2goDebug<

[X2Go-Commits] [x2goclient] 11/14: src/sshmasterconnection.cpp: replace deprecated channel_send_eof () function with ssh_channel_send_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit b53ea0167eb7943b080e9923f419c5205aebe3cc
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:12:09 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_send_eof () 
function with ssh_channel_send_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 28e2c4a..8fd4da2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -594,6 +594,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_write ()
   function with ssh_channel_write (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_send_eof ()
+  function with ssh_channel_send_eof (). Might break on ancient systems,
+  but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 91739b8..09dd40d 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1793,7 +1793,7 @@ void SshMasterConnection::finalize ( int item )
 ssh_channel channel=channelConnections.at ( item ).channel;
 if ( channel )
 {
-channel_send_eof ( channel );
+ssh_channel_send_eof ( channel );
 #ifdef DEBUG
 x2goDebug<<"EOF sent.";
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 14/14: src/sshmasterconnection.cpp: use QString::arg () to insert function name and thus deduplicate error translation messages.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 9aa514c6eada233f4a4e2935b99775ae2c0d3fd7
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:34:46 2017 +0100

src/sshmasterconnection.cpp: use QString::arg () to insert function name 
and thus deduplicate error translation messages.

Also re-add the full stop sign and remove it when needed for x2goDebug.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   31 ---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40aaf89..194b9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -603,6 +603,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_free () function
   with ssh_channel_free (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: use QString::arg () to insert function name
+  and thus deduplicate error translation messages. Also re-add the full
+  stop sign and remove it when needed for x2goDebug.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 21ab275..6469cd7 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1559,11 +1559,12 @@ void SshMasterConnection::channelLoop()
 
 if (!channel) {
 QString err = ssh_get_error (my_ssh_session);
-QString error_msg = tr ("ssh_channel_new failed");
-emit ioErr (channelConnections[i].creator, error_msg + 
".", err);
+/*: Argument in this context will be a function name. */
+QString error_msg = tr ("%1 failed.").arg 
("ssh_channel_new");
+emit ioErr (channelConnections[i].creator, error_msg, err);
 
 #ifdef DEBUG
-x2goDebug << errorMsg << ": " << err << endl;
+x2goDebug << error_msg.left (error_msg.size () - 1) << ": 
" << err << endl;
 #endif
 
 continue;
@@ -1584,10 +1585,10 @@ void SshMasterConnection::channelLoop()
 channelConnections.at ( i 
).localPort ) != SSH_OK )
 {
 QString err=ssh_get_error ( my_ssh_session );
-QString errorMsg=tr ( "ssh_channel_open_forward 
failed" );
-emit ioErr ( channelConnections[i].creator, errorMsg + 
".", err );
+QString errorMsg=tr ( "%1 failed." ).arg 
("ssh_channel_open_forward");
+emit ioErr ( channelConnections[i].creator, errorMsg, 
err );
 #ifdef DEBUG
-x2goDebug<

[X2Go-Commits] [x2goclient] 09/14: src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function with ssh_channel_is_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 7e87053dc9da1ab2eb59c03c880722902c25abb9
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:08:26 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function 
with ssh_channel_is_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index daea092..354947e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -588,6 +588,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_read () function
   with ssh_channel_read (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
+  function with ssh_channel_is_eof (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 5828d0f..2857e11 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1724,7 +1724,7 @@ void SshMasterConnection::channelLoop()
 continue;
 }
 
-if ( channel_is_eof ( channel ) )
+if ( ssh_channel_is_eof ( channel ) )
 {
 #ifdef DEBUG
 x2goDebug<<"EOF on channel "<pid;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 10/14: src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 1920cfd78bc209efd492fbebeec92623d4544c0b
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:10:26 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_write () function 
with ssh_channel_write ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |8 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 354947e..28e2c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -591,6 +591,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
   function with ssh_channel_is_eof (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_write ()
+  function with ssh_channel_write (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 2857e11..91739b8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1746,13 +1746,13 @@ void SshMasterConnection::channelLoop()
 #endif
 if ( nbytes > 0 )
 {
-if ( channel_write ( channel, buffer, nbytes ) !=nbytes )
+if ( ssh_channel_write ( channel, buffer, nbytes ) 
!=nbytes )
 {
 QString err=ssh_get_error ( my_ssh_session );
-QString errorMsg=tr ( "channel_write failed." );
-emit ioErr ( channelConnections[i].creator, errorMsg, 
err );
+QString errorMsg=tr ( "ssh_channel_write failed" );
+emit ioErr ( channelConnections[i].creator, errorMsg + 
".", err );
 #ifdef DEBUG
-x2goDebug<

[X2Go-Commits] [x2goclient] 12/14: src/sshmasterconnection.cpp: replace deprecated channel_close () function with ssh_channel_close ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit bfbc01fa015673551fb9d0b66f769ae193ff19e6
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:13:28 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_close () function 
with ssh_channel_close ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8fd4da2..564228a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -597,6 +597,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_send_eof ()
   function with ssh_channel_send_eof (). Might break on ancient systems,
   but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_close ()
+  function with ssh_channel_close (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 09dd40d..fc7c069 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1797,7 +1797,7 @@ void SshMasterConnection::finalize ( int item )
 #ifdef DEBUG
 x2goDebug<<"EOF sent.";
 #endif
-channel_close ( channel );
+ssh_channel_close ( channel );
 #ifdef DEBUG
 x2goDebug<<"Channel closed.";
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 04/14: src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit d5edf53e3b675d580222cd8a0e514d5740dbd963
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:45:31 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_forward () 
function with ssh_channel_open_forward ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 770d4a6..d20af7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -573,6 +573,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_new () function
   with ssh_channel_new (). Might break on ancient systems, but we don't
   care. Also, add error handling in case ssh_channel_new () failed...
+- src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
+  function with ssh_channel_open_forward (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index bb9a8dd..ba955cd 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1577,15 +1577,15 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Forwarding new channel, local port: 
"

[X2Go-Commits] [x2goclient] 03/14: src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit a23a3dba78f89cf80fa5bb2928be553c86b3f19d
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:36:03 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_new () function 
with ssh_channel_new ().

Might break on ancient systems, but we don't care.

Also, add error handling in case ssh_channel_new () failed...
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e09217..770d4a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -570,6 +570,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   first place.
 - src/sshmasterconnection.cpp: replace string_free () with its successor
   ssh_string_free (). Will break on ancient systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_new () function
+  with ssh_channel_new (). Might break on ancient systems, but we don't
+  care. Also, add error handling in case ssh_channel_new () failed...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 57ca78c..bb9a8dd 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1555,7 +1555,19 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Creating new channel."<

[X2Go-Commits] [x2goclient] 07/14: src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit bc6dd6e2d0463cf8a1cd9b4c3ecc95c675ed6668
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:54:41 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_poll () function 
with ssh_channel_poll ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8e3c50..25e0fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -582,6 +582,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
   function with ssh_channel_request_exec (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_poll () function
+  with ssh_channel_poll (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8417d34..babd71a 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1657,7 +1657,7 @@ void SshMasterConnection::channelLoop()
 ssh_channel channel=channelConnections.at ( i ).channel;
 if ( channel==0l )
 continue;
-if ( channel_poll ( channel,1 ) >0 )
+if ( ssh_channel_poll ( channel,1 ) > 0 )
 {
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
@@ -1668,7 +1668,7 @@ void SshMasterConnection::channelLoop()
 //  x2goDebug<

[X2Go-Commits] [x2goclient] 05/14: src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 456c140497fea88030bd15af3c71dc4813db78c8
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:50:05 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_session () 
function with ssh_channel_open_session ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d20af7d..ea45c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -576,6 +576,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
   function with ssh_channel_open_forward (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
+  function with ssh_channel_open_session (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index ba955cd..d671d35 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1602,11 +1602,11 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Executing remote: "

[X2Go-Commits] [x2goclient] 01/03: src/sshmasterconnection.cpp: fix up some debug strings.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit a8b9e3c4b1f53a31deb57267c03d0e6bbef4ef56
Author: Mihai Moldovan 
Date:   Thu Feb 2 06:56:32 2017 +0100

src/sshmasterconnection.cpp: fix up some debug strings.
---
 debian/changelog|1 +
 src/sshmasterconnection.cpp |8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 194b9d7..a1d7c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -606,6 +606,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: use QString::arg () to insert function name
   and thus deduplicate error translation messages. Also re-add the full
   stop sign and remove it when needed for x2goDebug.
+- src/sshmasterconnection.cpp: fix up some debug strings.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 6469cd7..c2e8659 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -173,9 +173,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, 
QString host, int por
 
 breakLoop=false;
 kerberosDelegation=false;
-x2goDebug << "SshMasterConnection, host " << host << "port " << port << 
"user " << user
-  << "useproxy " << useproxy << "proxyserver " << proxyserver
-  << "proxyport " << proxyport;
+x2goDebug << "SshMasterConnection, host " << host << "; port " << port << 
"; user " << user
+  << "; useproxy " << useproxy << "; proxyserver " << proxyserver
+  << "; proxyport " << proxyport;
 this->host=host;
 this->port=port;
 this->user=user;
@@ -467,7 +467,7 @@ void SshMasterConnection::run()
 #endif
 if(useproxy && proxytype==PROXYSSH)
 {
-x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << 
proxyport << "proxylogin: " << proxylogin;
+x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << 
proxyport << "; proxylogin: " << proxylogin;
 sshProxy=new SshMasterConnection (0, proxyserver, 
proxyport,acceptUnknownServers,
   proxylogin, proxypassword, proxykey, 
proxyautologin, proxyKrbLogin, false);
 connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( 
slotSshProxyConnectionOk() ) );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 03/03: src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 0ba2e5513bf3b327342719172bfc99fb71ca60d6
Author: Mihai Moldovan 
Date:   Thu Feb 2 08:09:08 2017 +0100

src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

Shorthands as host names and other bells and whistles like inferred port
or user name values are now supported.
---
 debian/changelog|3 +
 src/sessionwidget.cpp   |   19 --
 src/sshmasterconnection.cpp |  148 +--
 3 files changed, 143 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f76e2e..7c18ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -609,6 +609,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: fix up some debug strings.
 - src/sshmasterconnection.cpp: port more occurrences of "QString to C
   string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
+- src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config.
+  Fixes: #1121. Shorthands as host names and other bells and whistles like
+  inferred port or user name values are now supported.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 9fd2781..e70aff6 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -84,17 +84,23 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 #else
 QFrame* sgb=this;
 #endif
+const QString ssh_port_tooltip_text = tr ("Values ranging from 0 to 
65535 are allowed."
+  "A value of 0 will 
either use the port specified in the "
+  "SSH configuration file 
belonging to a host or shortname, "
+  "or use the default of 
22.");
 server=new QLineEdit ( sgb );
 uname=new QLineEdit ( sgb );
 sshPort=new QSpinBox ( sgb );
 sshPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-sshPort->setMinimum ( 1 );
-sshPort->setMaximum ( 9 );
+sshPort->setMinimum ( 0 );
+sshPort->setMaximum ( 65535 );
+sshPort->setToolTip (ssh_port_tooltip_text);
 #ifdef Q_OS_LINUX
 rdpPort=new QSpinBox ( sgb );
 rdpPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-rdpPort->setMinimum ( 1 );
-rdpPort->setMaximum ( 9 );
+rdpPort->setMinimum ( 0 );
+rdpPort->setMaximum ( 65535 );
+rdpPort->setToolTip (ssh_port_tooltip_text);
 #endif
 key=new QLineEdit ( sgb );
 
@@ -156,8 +162,9 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 proxyType->addButton(rbHttpProxy);
 proxyHost=new QLineEdit(proxyBox);
 proxyPort=new QSpinBox(proxyBox);
-proxyPort->setMinimum ( 1 );
-proxyPort->setMaximum ( 9 );
+proxyPort->setMinimum ( 0 );
+proxyPort->setMaximum ( 65535 );
+proxyPort->setToolTip (ssh_port_tooltip_text);
 
 cbProxySameUser=new QCheckBox(tr("Same login as on X2Go Server"), 
proxyBox);
 proxyLogin=new QLineEdit(proxyBox);
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index bd05809..46d4f7e 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -195,14 +195,53 @@ SshMasterConnection::SshMasterConnection (QObject* 
parent, QString host, int por
 mainWnd=(ONMainWindow*) parent;
 kerberos=krblogin;
 challengeAuthVerificationCode=QString::null;
-if(this->user==QString::null||this->user.length()<=0)
-{
+
+if (this->user.isEmpty ()) {
+/* We might have a config file request pending, honor this. */
+ssh_session tmp_session = ssh_new ();
+
+if (!tmp_session) {
+QString error_msg = tr ("Cannot create SSH session.");
+error_msg += " " + tr ("Using environment-provided username.");
+#ifdef DEBUG
+x2goDebug << error_msg;
+#endif
+}
+else {
+QByteArray tmp_BA;
+
+if ((useproxy) && (PROXYSSH == proxytype)) {
+tmp_BA = this->proxyserver.toLocal8Bit ();
+}
+else {
+tmp_BA = this->host.toLocal8Bit ();
+}
+
+ssh_options_set (tmp_session, SSH_OPTIONS_HOST, tmp_BA.data ());
+
+if (ssh_options_parse_config (tmp_session, NULL) < 0) {
+x2goDebug << "Warning: unable to parse the SSH config file.";
+}
+
+char *inferred_username = NULL;
+ssh_options_get (tmp_session, SSH_OPTIONS_USER, 
_username);
+x2goDebug << "Temporary session user name after config file parse: 
" << inferred_username;
+
+this->user = QString::fromLocal8Bit (inferred_username);
+
+

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (9aa514c -> 0ba2e55)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  from  9aa514c   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
   new  a8b9e3c   src/sshmasterconnection.cpp: fix up some debug strings.
   new  148f236   src/sshmasterconnection.cpp: port more occurrences of 
"QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
   new  0ba2e55   src/sshmasterconnection.cpp: enable parsing of 
~/.ssh/config. Fixes: #1121.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|6 ++
 src/sessionwidget.cpp   |   19 +++--
 src/sshmasterconnection.cpp |  187 ++-
 3 files changed, 168 insertions(+), 44 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/03: src/sshmasterconnection.cpp: port more occurrences of "QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 148f2360e291f6095c4c4cb888970de602dfa8ab
Author: Mihai Moldovan 
Date:   Thu Feb 2 08:06:03 2017 +0100

src/sshmasterconnection.cpp: port more occurrences of "QString to C string" 
akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |   31 ++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1d7c37..8f76e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -607,6 +607,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   and thus deduplicate error translation messages. Also re-add the full
   stop sign and remove it when needed for x2goDebug.
 - src/sshmasterconnection.cpp: fix up some debug strings.
+- src/sshmasterconnection.cpp: port more occurrences of "QString to C
+  string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c2e8659..bd05809 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -541,16 +541,20 @@ void SshMasterConnection::run()
 }
 
 #ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, 
(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
+{
+QByteArray tmp_BA = (mainWnd->getHomeDirectory () + 
"/ssh").toLocal8Bit ();
+
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, tmp_BA.data ());
 #ifdef DEBUG
-x2goDebug<<"Setting SSH directory to 
"<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit();
+x2goDebug << "Setting SSH directory to " << tmp_BA.data ();
 #endif
-if (kerberos)
-{
-parseKnownHosts();
+if (kerberos)
+{
+parseKnownHosts();
+}
 }
-
 #endif
+
 ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, );
 
 ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, );
@@ -652,17 +656,18 @@ void SshMasterConnection::run()
 return;
 }
 
-#ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toLocal8Bit() );
-#else
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toLatin1() );
-#endif
+QByteArray tmp_BA = user.toLocal8Bit ();
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, tmp_BA.data () );
 
 #ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, 
(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
+{
+QByteArray tmp_BA = (mainWnd->getHomeDirectory () + 
"/ssh").toLocal8Bit ();
+
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, tmp_BA.data () 
);
 #ifdef DEBUG
-x2goDebug<<"Setting SSH directory to 
"<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit();
+x2goDebug << "Setting SSH directory to " << tmp_BA.data ();
 #endif
+}
 #endif
 
 if ( userAuth() )

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch master updated (40be528 -> ec534c7)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  40be528   src/onmainwindow.cpp: correctly guard the new lines from 
the previous commit.
   new  b114c54   res/i18n/x2goclient_es.ts: update Spanish translation 
file.
   new  ec534c7   res/i18n/x2goclient_es.ts: fixup Spanish translation file 
where necessary and add comments/requests for re-translations for the next time.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |7 ++
 res/i18n/x2goclient_es.ts |  218 ++---
 2 files changed, 134 insertions(+), 91 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: res/i18n/x2goclient_es.ts: update Spanish translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b114c544d36efcd042a302589b5b0f62fb71d2a8
Author: Ricardo Díaz Martín 
Date:   Tue Feb 7 04:53:55 2017 +0100

res/i18n/x2goclient_es.ts: update Spanish translation file.
---
 debian/changelog  |4 +
 res/i18n/x2goclient_es.ts |  211 +
 2 files changed, 120 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad063a..4a8aaab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -584,6 +584,10 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.0):
 - res/i18n/x2goclient_sv.ts: update Swedish translation file.
 
+  [ Ricardo Díaz Martín ]
+  * New upstream release (4.1.0.0):
+- res/i18n/x2goclient_es.ts: update Spanish translation file.
+
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index cea8902..c88a120 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -330,12 +330,12 @@
 
 
 PulseAudio settings
-
+Configuración PulseAudio
 
 
 
 Disable sound input
-
+Desactivar entrada de sonido
 
 
 Clientside (local) SSH daemon port for file system export 
usage:
@@ -809,217 +809,217 @@ Algunas localizaciones habituales pueden ser:
 
 
 Shows this message.
-
+Muestra este mensaje.
 
 
 
 Prints version information.
-
+Imprime informacion de la versión.
 
 
 
 Shows the changelog.
-
+Muestra el registro de cambios.
 
 
 
 Shows git information as used at compile time. [Deprecated: 
please use --version.]
-
+Muestra la información git usada durante el compilado- 
[Obsoleto: mejor usar --version.]
 
 
 
 Shows available pack methods.
-
+Muestra los métodos de empaquetado 
disponibles.
 
 
 
 Do not resume sessions automatically.
-
+No retomar sesiones automáticamente.
 
 
 
 Hides menu bar.
-
+Oculta la barra de menú.
 
 
 
 Disables session editing.
-
+Desactiva la edición de la sesión.
 
 
 
 Starts maximized.
-
+Inica maximizado.
 
 
 
 Starts hidden (minimized to system tray where 
available.)
-
+Inicia oculto (minimizado en la bandeja del sistema 
cuando esté disponible.)
 
 
 
 Starts in portable mode.
-
+Inicia en modo portable.
 
 
 
 Forces OpenPGP smart card authentication.
-
+Fuerza autenticacación OpenPGP smart card.
 
 
 
 Enables Xinerama by default.
-
+Activa Xinerama por defecto.
 
 
 
 Allows client side printing in LDAP mode.
-
+Permite la impresión en el lado del cliente en el modo 
LDAP.
 
 
 
 Enables thinclient mode. Starts without a window 
manager.
-
+Activa el modo thinclient. Inicia sin gestor de 
ventanas.
 
 
 
 Enables shutdown button.
-
+Activa el botón de apagado.
 
 
 
 Adds RSA key fingerprint to .ssh/known_hosts if 
authenticity of the server cant be determined.
-
+Añade huella de clave RSA a .ssh/known_hosts 
if la autenticidad del servidor no se puede determinar.
 
 
 
 Starts with LDAP support. Example: 
--ldap=ldapserver:389:o=organization,c=de
-
+Inicia con soporte LDAP. Ejempo: 
--ldap=ldapserver:389:o=orga nizacion,c=es
 
 
 
 Defines the first LDAP failover server.
-
+Define el primer servidor de reserva LDAP.
 
 
 
 Defines the second LDAP failover server.
-
+Define el segundo servidor de reserva LDAP.
 
 
 
 Defines the remote SSH server port. Default: 22.
-
+Define el puerto SSH del servidor remoto. Por defecto: 
22.
 
 
 
 Defines the local machines SSH server port. Needed for 
Client-Side Printing and File Sharing support. Default: 22.
-
+Define el puerto SSH del ordenador local. Es necesario 
para el soporte de impresión local y las carpetas compartidas. Por defecto: 
22.
 
 
 
 Sets the default command. Default: KDE (Desktop 
Session)
-
+Define el comando por defecto: Por defecto 
KDE (Sesión de 

[X2Go-Commits] [x2goclient] 02/02: res/i18n/x2goclient_es.ts: fixup Spanish translation file where necessary and add comments/requests for re-translations for the next time.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit ec534c73c2672095e437941abb8d60d5ac5e0aae
Author: Mihai Moldovan 
Date:   Tue Feb 7 05:55:43 2017 +0100

res/i18n/x2goclient_es.ts: fixup Spanish translation file where necessary 
and add comments/requests for re-translations for the next time.
---
 debian/changelog  |3 +++
 res/i18n/x2goclient_es.ts |   63 -
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a8aaab..705916b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -557,6 +557,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time (for instance when running x2goclient --help.)
 - src/onmainwindow.cpp: correctly guard the new lines from the previous
   commit. Fixes compile issues on Linux and other systems.
+- res/i18n/x2goclient_es.ts: fixup Spanish translation file where
+  necessary and add comments/requests for re-translations for the next
+  time.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index c88a120..8abeaca 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -824,7 +824,7 @@ Algunas localizaciones habituales pueden ser:
 
 
 Shows git information as used at compile time. [Deprecated: 
please use --version.]
-Muestra la información git usada durante el compilado- 
[Obsoleto: mejor usar --version.]
+Muestra la información git usada durante el compilado. 
[Obsoleto: mejor usar --version.]
 
 
 
@@ -894,7 +894,7 @@ Algunas localizaciones habituales pueden ser:
 
 
 Starts with LDAP support. Example: 
--ldap=ldapserver:389:o=organization,c=de
-Inicia con soporte LDAP. Ejempo: 
--ldap=ldapserver:389:o=orga nizacion,c=es
+Inicia con soporte LDAP. Ejempo: 
--ldap=ldapserver:389:o=organizacion,c=es
 
 
 
@@ -919,7 +919,7 @@ Algunas localizaciones habituales pueden ser:
 
 
 Sets the default command. Default: KDE (Desktop 
Session)
-Define el comando por defecto: Por defecto 
KDE (Sesión de Escritorio)
+Define el comando por defecto. Por defecto 
KDE (Sesión de Escritorio)
 
 
 
@@ -1004,7 +1004,7 @@ Algunas localizaciones habituales pueden ser:
 
 
 Sets the broker name to display in X2Go Client. This parameter 
is optional.
-Define el nombre del broer a mostrar en el cliente X2go. 
Este parámetro es opcional.
+Define el nombre del broer a mostrar en el cliente X2Go. 
Este parámetro es opcional.
 
 
 
@@ -1300,14 +1300,16 @@ el sonido en conexiones a través de 
firewalls
 ARTS support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-El soporte ARTS está previsto sea eliminado en 
breve.
+Please don't forget the second line!
+El soporte ARTS está previsto sea 
eliminado en breve.
 
 
 
 ESounD support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-El soporte ESounD está previsto sea eliminado en 
breve.
+Please don't forget the second line!
+El soporte ESounD está previsto sea 
eliminado en breve.
 
 
 
@@ -2839,17 +2841,17 @@ Los documentos no guardados se perderán.
 
 
 Unable to change the permissions of directory: 
-
+
 
 
 
 This is an error because sshd would deny such a 
directory.
-
+
 
 
 
 Unable to find the sftp-server binary. Neither bundled, nor 
found in $PATH nor additional directories.
-
+
 
 
 
@@ -2858,7 +2860,7 @@ Los documentos no guardados se perderán.
 If the sftp-server binary is installed on your system, please report a bug 
mentioning its path on:
 centera 
href=https://wiki.x2go.org/doku.php/wiki:bugshttps://wiki.x2go.org/doku.php/wiki:bugs/a/center;
 
-
+
 
 
 
@@ -2882,7 +2884,8 @@ If the sftp-server binary is installed on your system, 
please report a bug menti
 
 
 SSH key base directory creation error
-Error al crear la clave SSH
+The error isn't really about the SSH key creation itself, but 
about the *base* directory.
+Error al crear la clave 
SSH
 
 
 
@@ -2902,22 +2905,26 @@ If the sftp-server binary is installed on your system, 
please report a bug menti
 
 
 ssh-keygen crashed
-fallo al ejecutar ssh-keygen
+Please be more specific, "crashed" doesn't mean 
"execute"...
+fallo al ejecutar 
ssh-keygen
 
 
 
 The ssh-keygen binary crashed.
-fallo al ejecutar ssh-keygen.
+

[X2Go-Commits] [x2goclient] 14/18: src/sshmasterconnection.cpp: replace deprecated channel_free () function with ssh_channel_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit ae43804310c747a480614ff6842d5fb8b0f4989a
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:14:56 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_free () function 
with ssh_channel_free ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7c9715d..cc91bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -603,6 +603,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_close ()
   function with ssh_channel_close (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_free () function
+  with ssh_channel_free (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index fc7c069..21ab275 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1801,7 +1801,7 @@ void SshMasterConnection::finalize ( int item )
 #ifdef DEBUG
 x2goDebug<<"Channel closed.";
 #endif
-channel_free ( channel );
+ssh_channel_free ( channel );
 }
 if ( tcpSocket>0 )
 {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 12/18: src/sshmasterconnection.cpp: replace deprecated channel_send_eof () function with ssh_channel_send_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 9ab085920347ebf14e6613c821b2bdd63887f29f
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:12:09 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_send_eof () 
function with ssh_channel_send_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fbc1cff..58cca50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -597,6 +597,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_write ()
   function with ssh_channel_write (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_send_eof ()
+  function with ssh_channel_send_eof (). Might break on ancient systems,
+  but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 91739b8..09dd40d 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1793,7 +1793,7 @@ void SshMasterConnection::finalize ( int item )
 ssh_channel channel=channelConnections.at ( item ).channel;
 if ( channel )
 {
-channel_send_eof ( channel );
+ssh_channel_send_eof ( channel );
 #ifdef DEBUG
 x2goDebug<<"EOF sent.";
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 13/18: src/sshmasterconnection.cpp: replace deprecated channel_close () function with ssh_channel_close ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit a5ecc9fd4278aaffa2b3ecb7db9c60a95d8699b3
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:13:28 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_close () function 
with ssh_channel_close ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 58cca50..7c9715d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -600,6 +600,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_send_eof ()
   function with ssh_channel_send_eof (). Might break on ancient systems,
   but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_close ()
+  function with ssh_channel_close (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 09dd40d..fc7c069 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1797,7 +1797,7 @@ void SshMasterConnection::finalize ( int item )
 #ifdef DEBUG
 x2goDebug<<"EOF sent.";
 #endif
-channel_close ( channel );
+ssh_channel_close ( channel );
 #ifdef DEBUG
 x2goDebug<<"Channel closed.";
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 10/18: src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function with ssh_channel_is_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 6770e2322d726e417b0df35577fd3d69c1c86b8a
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:08:26 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function 
with ssh_channel_is_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4260f69..f133773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -591,6 +591,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_read () function
   with ssh_channel_read (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
+  function with ssh_channel_is_eof (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 5828d0f..2857e11 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1724,7 +1724,7 @@ void SshMasterConnection::channelLoop()
 continue;
 }
 
-if ( channel_is_eof ( channel ) )
+if ( ssh_channel_is_eof ( channel ) )
 {
 #ifdef DEBUG
 x2goDebug<<"EOF on channel "<pid;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/17: src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () (0.8.0 and higher) or ssh_get_publickey () (0.7.x and lo

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 11ca6177f80cac5c44516d9a6a86cab32c7c99e8
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:08:43 2017 +0100

src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public 
key via ssh_get_server_publickey () (0.8.0 and higher) or ssh_get_publickey () 
(0.7.x and lower) and its hash via ssh_get_publickey_hash () instead of using 
the deprecated ssh_get_pubkey_hash () function.

Additionally, replace free () with the more appropriate
ssh_string_free_char () function after using ssh_get_hexa ().

This will break on very old systems with a hopelessly outdated libssh
version, but we do not care about these systems in the first place.
---
 debian/changelog|9 +
 src/sshmasterconnection.cpp |   40 +---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db1b531..62b8a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -562,6 +562,15 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time.
 - src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
   of ssh_forward_listen () for newer libssh versions. Fixes: #870.
+- src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public
+  key via ssh_get_server_publickey () (0.8.0 and higher) or
+  ssh_get_publickey () (0.7.x and lower) and its hash via
+  ssh_get_publickey_hash () instead of using the deprecated
+  ssh_get_pubkey_hash () function. Additionally, replace free () with the
+  more appropriate ssh_string_free_char () function after using
+  ssh_get_hexa (). This will break on very old systems with a hopelessly
+  outdated libssh version, but we do not care about these systems in the
+  first place.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index b3f9aa3..c786717 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -20,6 +20,7 @@
 #include "sshmasterconnection.h"
 #include 
 #include 
+#include 
 #include "sshprocess.h"
 
 
@@ -812,22 +813,47 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
 x2goDebug<<"cserverAuth";
 #endif
 
-int state, hlen;
+int state = SSH_SERVER_ERROR;
 unsigned char *hash = NULL;
-char *hexa;
+char *hexa = NULL;
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+ssh_key srv_pubkey = { 0 };
+int rc = SSH_ERROR;
+size_t hlen = 0;
+#else
+int hlen = 0;
+#endif
 
 state = ssh_is_server_known ( my_ssh_session );
-hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
 
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 8, 0)
+rc = ssh_get_server_publickey (my_ssh_session, _pubkey);
+#else /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 8, 0) */
+rc = ssh_get_publickey (my_ssh_session, _pubkey);
+#endif /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 8, 0) */
+
+if (SSH_OK != rc) {
+return (SSH_SERVER_ERROR);
+}
+
+rc = ssh_get_publickey_hash (srv_pubkey, SSH_PUBLICKEY_HASH_SHA1, , 
);
+ssh_key_free (srv_pubkey);
 
-if ( hlen < 0 )
+if (0 != rc) {
+return (SSH_SERVER_ERROR);
+}
+#else
+hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
+#endif
+
+if ( 0 >= hlen )
 return SSH_SERVER_ERROR;
 
 #ifdef DEBUG
 x2goDebug<<"state: "<

[X2Go-Commits] [x2goclient] 02/17: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 33907e6d6a920c9c097027c42946a9f9619118e8
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:15:38 2017 +0100

src/sshmasterconnection.cpp: replace string_free () with its successor 
ssh_string_free ().

Will break on ancient systems, but we don't care.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 62b8a77..cb8bc9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -571,6 +571,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   ssh_get_hexa (). This will break on very old systems with a hopelessly
   outdated libssh version, but we do not care about these systems in the
   first place.
+- src/sshmasterconnection.cpp: replace string_free () with its successor
+  ssh_string_free (). Will break on ancient systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c786717..57c33fa 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1192,7 +1192,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
 privatekey_free(prkey);
-string_free(pubkeyStr);
+ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
 x2goDebug<<"Authenticating with key: "<

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (5479c31 -> fbb7b42)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  discards  5479c31   src/sshmasterconnection.cpp: enable parsing of 
~/.ssh/config. Fixes: #1121.
  discards  fc84c24   src/sshmasterconnection.cpp: port more occurrences of 
"QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
  discards  bd335f0   src/sshmasterconnection.cpp: fix up some debug strings.
  discards  b1e826e   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
  discards  ae43804   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
  discards  a5ecc9f   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
  discards  9ab0859   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
  discards  d6ef7cf   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
  discards  6770e23   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
  discards  9c326fd   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
  discards  a34bb98   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
  discards  6e8faf2   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
  discards  e753fe2   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
  discards  0c9dc98   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
  discards  d1e7566   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
  discards  530a5e6   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
  discards  d8d30e3   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () (0.7.4 and higher) or 
ssh_get_publickey () (0.7.3 and lower) and its hash via ssh_get_publickey_hash 
() instead of using the deprecated ssh_get_pubkey_hash () function.
   new  11ca617   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () (0.8.0 and higher) or 
ssh_get_publickey () (0.7.x and lower) and its hash via ssh_get_publickey_hash 
() instead of using the deprecated ssh_get_pubkey_hash () function.
   new  33907e6   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
   new  8063573   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
   new  49e2cd6   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
   new  81796f5   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
   new  4462ca3   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
   new  2fd60e8   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
   new  2ba4653   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
   new  6e894f1   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
   new  e823424   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
   new  5da95dd   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
   new  d3d5a51   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
   new  0748074   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
   new  d4ce55b   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
   new  56e2dc3   src/sshmasterconnection.cpp: fix up some debug strings.
   new  284c090   src/sshmasterconnection.cpp: port more occurrences of 
"QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
   new  fbb7b42   src/sshmasterconnection.cpp: enable parsing of 
~/.ssh/config. Fixes: #1121.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository

[X2Go-Commits] [x2goclient] 05/17: src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 81796f5687d84697e9d6fa2d268c9fb56cf0592d
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:50:05 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_session () 
function with ssh_channel_open_session ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 277b592..6c96f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -579,6 +579,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
   function with ssh_channel_open_forward (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
+  function with ssh_channel_open_session (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c7d851b..8ca51b8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1602,11 +1602,11 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Executing remote: "

[X2Go-Commits] [x2goclient] 13/17: src/sshmasterconnection.cpp: replace deprecated channel_free () function with ssh_channel_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 07480747482b2304d5dba8e4ee0be52d213a57ac
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:14:56 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_free () function 
with ssh_channel_free ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5401c66..8464b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -603,6 +603,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_close ()
   function with ssh_channel_close (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_free () function
+  with ssh_channel_free (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 292c703..93ec02d 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1801,7 +1801,7 @@ void SshMasterConnection::finalize ( int item )
 #ifdef DEBUG
 x2goDebug<<"Channel closed.";
 #endif
-channel_free ( channel );
+ssh_channel_free ( channel );
 }
 if ( tcpSocket>0 )
 {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 17/17: src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit fbb7b42e94187fb16debf7a9f0726279aecf1ef3
Author: Mihai Moldovan 
Date:   Thu Feb 2 08:09:08 2017 +0100

src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

Shorthands as host names and other bells and whistles like inferred port
or user name values are now supported.
---
 debian/changelog|3 +
 src/sessionwidget.cpp   |   19 --
 src/sshmasterconnection.cpp |  148 +--
 3 files changed, 143 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75d4164..1e7ab6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -612,6 +612,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: fix up some debug strings.
 - src/sshmasterconnection.cpp: port more occurrences of "QString to C
   string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
+- src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config.
+  Fixes: #1121. Shorthands as host names and other bells and whistles like
+  inferred port or user name values are now supported.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 9fd2781..e70aff6 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -84,17 +84,23 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 #else
 QFrame* sgb=this;
 #endif
+const QString ssh_port_tooltip_text = tr ("Values ranging from 0 to 
65535 are allowed."
+  "A value of 0 will 
either use the port specified in the "
+  "SSH configuration file 
belonging to a host or shortname, "
+  "or use the default of 
22.");
 server=new QLineEdit ( sgb );
 uname=new QLineEdit ( sgb );
 sshPort=new QSpinBox ( sgb );
 sshPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-sshPort->setMinimum ( 1 );
-sshPort->setMaximum ( 9 );
+sshPort->setMinimum ( 0 );
+sshPort->setMaximum ( 65535 );
+sshPort->setToolTip (ssh_port_tooltip_text);
 #ifdef Q_OS_LINUX
 rdpPort=new QSpinBox ( sgb );
 rdpPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-rdpPort->setMinimum ( 1 );
-rdpPort->setMaximum ( 9 );
+rdpPort->setMinimum ( 0 );
+rdpPort->setMaximum ( 65535 );
+rdpPort->setToolTip (ssh_port_tooltip_text);
 #endif
 key=new QLineEdit ( sgb );
 
@@ -156,8 +162,9 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 proxyType->addButton(rbHttpProxy);
 proxyHost=new QLineEdit(proxyBox);
 proxyPort=new QSpinBox(proxyBox);
-proxyPort->setMinimum ( 1 );
-proxyPort->setMaximum ( 9 );
+proxyPort->setMinimum ( 0 );
+proxyPort->setMaximum ( 65535 );
+proxyPort->setToolTip (ssh_port_tooltip_text);
 
 cbProxySameUser=new QCheckBox(tr("Same login as on X2Go Server"), 
proxyBox);
 proxyLogin=new QLineEdit(proxyBox);
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index b08acd0..acda638 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -195,14 +195,53 @@ SshMasterConnection::SshMasterConnection (QObject* 
parent, QString host, int por
 mainWnd=(ONMainWindow*) parent;
 kerberos=krblogin;
 challengeAuthVerificationCode=QString::null;
-if(this->user==QString::null||this->user.length()<=0)
-{
+
+if (this->user.isEmpty ()) {
+/* We might have a config file request pending, honor this. */
+ssh_session tmp_session = ssh_new ();
+
+if (!tmp_session) {
+QString error_msg = tr ("Cannot create SSH session.");
+error_msg += " " + tr ("Using environment-provided username.");
+#ifdef DEBUG
+x2goDebug << error_msg;
+#endif
+}
+else {
+QByteArray tmp_BA;
+
+if ((useproxy) && (PROXYSSH == proxytype)) {
+tmp_BA = this->proxyserver.toLocal8Bit ();
+}
+else {
+tmp_BA = this->host.toLocal8Bit ();
+}
+
+ssh_options_set (tmp_session, SSH_OPTIONS_HOST, tmp_BA.data ());
+
+if (ssh_options_parse_config (tmp_session, NULL) < 0) {
+x2goDebug << "Warning: unable to parse the SSH config file.";
+}
+
+char *inferred_username = NULL;
+ssh_options_get (tmp_session, SSH_OPTIONS_USER, 
_username);
+x2goDebug << "Temporary session user name after config file parse: 
" << inferred_username;
+
+this->user = QString::fromLocal8Bit (inferred_username);
+
+

[X2Go-Commits] [x2goclient] 11/17: src/sshmasterconnection.cpp: replace deprecated channel_send_eof () function with ssh_channel_send_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 5da95dd67021db42c44f9cd12048fb9e08f3016c
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:12:09 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_send_eof () 
function with ssh_channel_send_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c54e598..1cdfc57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -597,6 +597,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_write ()
   function with ssh_channel_write (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_send_eof ()
+  function with ssh_channel_send_eof (). Might break on ancient systems,
+  but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c8379f0..fefa479 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1793,7 +1793,7 @@ void SshMasterConnection::finalize ( int item )
 ssh_channel channel=channelConnections.at ( item ).channel;
 if ( channel )
 {
-channel_send_eof ( channel );
+ssh_channel_send_eof ( channel );
 #ifdef DEBUG
 x2goDebug<<"EOF sent.";
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 15/17: src/sshmasterconnection.cpp: fix up some debug strings.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 56e2dc3cb9d1b45d0570d66c3a7e0182726205e2
Author: Mihai Moldovan 
Date:   Thu Feb 2 06:56:32 2017 +0100

src/sshmasterconnection.cpp: fix up some debug strings.
---
 debian/changelog|1 +
 src/sshmasterconnection.cpp |8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2463d4f..55133b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -609,6 +609,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: use QString::arg () to insert function name
   and thus deduplicate error translation messages. Also re-add the full
   stop sign and remove it when needed for x2goDebug.
+- src/sshmasterconnection.cpp: fix up some debug strings.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 4178730..543be5c 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -173,9 +173,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, 
QString host, int por
 
 breakLoop=false;
 kerberosDelegation=false;
-x2goDebug << "SshMasterConnection, host " << host << "port " << port << 
"user " << user
-  << "useproxy " << useproxy << "proxyserver " << proxyserver
-  << "proxyport " << proxyport;
+x2goDebug << "SshMasterConnection, host " << host << "; port " << port << 
"; user " << user
+  << "; useproxy " << useproxy << "; proxyserver " << proxyserver
+  << "; proxyport " << proxyport;
 this->host=host;
 this->port=port;
 this->user=user;
@@ -467,7 +467,7 @@ void SshMasterConnection::run()
 #endif
 if(useproxy && proxytype==PROXYSSH)
 {
-x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << 
proxyport << "proxylogin: " << proxylogin;
+x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << 
proxyport << "; proxylogin: " << proxylogin;
 sshProxy=new SshMasterConnection (0, proxyserver, 
proxyport,acceptUnknownServers,
   proxylogin, proxypassword, proxykey, 
proxyautologin, proxyKrbLogin, false);
 connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( 
slotSshProxyConnectionOk() ) );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 05/18: src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 0c9dc982a93c04a17617bf91580738c8dc4649f0
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:45:31 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_forward () 
function with ssh_channel_open_forward ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28c1ba5..45a6816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -576,6 +576,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_new () function
   with ssh_channel_new (). Might break on ancient systems, but we don't
   care. Also, add error handling in case ssh_channel_new () failed...
+- src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
+  function with ssh_channel_open_forward (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index bb9a8dd..ba955cd 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1577,15 +1577,15 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Forwarding new channel, local port: 
"

[X2Go-Commits] [x2goclient] 06/18: src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit e753fe2ce5c21282d9a9ba5b65450f80011a992b
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:50:05 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_session () 
function with ssh_channel_open_session ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45a6816..907966f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -579,6 +579,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
   function with ssh_channel_open_forward (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
+  function with ssh_channel_open_session (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index ba955cd..d671d35 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1602,11 +1602,11 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Executing remote: "

[X2Go-Commits] [x2goclient] 04/18: src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit d1e7566ee36be568552d0a07474fd2ff0b717a27
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:36:03 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_new () function 
with ssh_channel_new ().

Might break on ancient systems, but we don't care.

Also, add error handling in case ssh_channel_new () failed...
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b6c2ea7..28c1ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -573,6 +573,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   first place.
 - src/sshmasterconnection.cpp: replace string_free () with its successor
   ssh_string_free (). Will break on ancient systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_new () function
+  with ssh_channel_new (). Might break on ancient systems, but we don't
+  care. Also, add error handling in case ssh_channel_new () failed...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 57ca78c..bb9a8dd 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1555,7 +1555,19 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Creating new channel."<

[X2Go-Commits] [x2goclient] 02/18: src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () (0.7.4 and higher) or ssh_get_publickey () (0.7.3 and lo

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit d8d30e34d2515f91eb46b8f2f58d65ee9880f183
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:08:43 2017 +0100

src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public 
key via ssh_get_server_publickey () (0.7.4 and higher) or ssh_get_publickey () 
(0.7.3 and lower) and its hash via ssh_get_publickey_hash () instead of using 
the deprecated ssh_get_pubkey_hash () function.

Additionally, replace free () with the more appropriate
ssh_string_free_char () function after using ssh_get_hexa ().

This will break on very old systems with a hopelessly outdated libssh
version, but we do not care about these systems in the first place.
---
 debian/changelog|9 +
 src/sshmasterconnection.cpp |   40 +---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db1b531..b1d9fee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -562,6 +562,15 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time.
 - src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
   of ssh_forward_listen () for newer libssh versions. Fixes: #870.
+- src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public
+  key via ssh_get_server_publickey () (0.7.4 and higher) or
+  ssh_get_publickey () (0.7.3 and lower) and its hash via
+  ssh_get_publickey_hash () instead of using the deprecated
+  ssh_get_pubkey_hash () function. Additionally, replace free () with the
+  more appropriate ssh_string_free_char () function after using
+  ssh_get_hexa (). This will break on very old systems with a hopelessly
+  outdated libssh version, but we do not care about these systems in the
+  first place.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index b3f9aa3..99e35df 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -20,6 +20,7 @@
 #include "sshmasterconnection.h"
 #include 
 #include 
+#include 
 #include "sshprocess.h"
 
 
@@ -812,22 +813,47 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
 x2goDebug<<"cserverAuth";
 #endif
 
-int state, hlen;
+int state = SSH_SERVER_ERROR;
 unsigned char *hash = NULL;
-char *hexa;
+char *hexa = NULL;
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+ssh_key srv_pubkey = { 0 };
+int rc = SSH_ERROR;
+size_t hlen = 0;
+#else
+int hlen = 0;
+#endif
 
 state = ssh_is_server_known ( my_ssh_session );
-hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
 
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4)
+rc = ssh_get_server_publickey (my_ssh_session, _pubkey);
+#else /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4) */
+rc = ssh_get_publickey (my_ssh_session, _pubkey);
+#endif /* LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 4) */
+
+if (SSH_OK != rc) {
+return (SSH_SERVER_ERROR);
+}
+
+rc = ssh_get_publickey_hash (srv_pubkey, SSH_PUBLICKEY_HASH_SHA1, , 
);
+ssh_key_free (srv_pubkey);
 
-if ( hlen < 0 )
+if (0 != rc) {
+return (SSH_SERVER_ERROR);
+}
+#else
+hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
+#endif
+
+if ( 0 >= hlen )
 return SSH_SERVER_ERROR;
 
 #ifdef DEBUG
 x2goDebug<<"state: "<

[X2Go-Commits] [x2goclient] 01/18: src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh versions. Fixes: #870.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 93dd9152d5e1b2cb4700658934da417664e26379
Author: Mihai Moldovan 
Date:   Sat Jan 28 16:04:28 2017 +0100

src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of 
ssh_forward_listen () for newer libssh versions. Fixes: #870.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |   35 ---
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 705916b..db1b531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -560,6 +560,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - res/i18n/x2goclient_es.ts: fixup Spanish translation file where
   necessary and add comments/requests for re-translations for the next
   time.
+- src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
+  of ssh_forward_listen () for newer libssh versions. Fixes: #870.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 84e0970..b3f9aa3 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -279,22 +279,35 @@ void SshMasterConnection::addReverseTunnelConnections()
 if(!reverseTunnelRequest[i].listen)
 {
 reverseTunnelRequest[i].listen=true;
-int rc=ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
-if(rc==SSH_OK)
-{
-emit reverseTunnelOk(reverseTunnelRequest[i].creator);
+
+int rc = SSH_AGAIN;
+
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
+/* Non-blocking mode may return SSH_AGAIN, so try again if 
neceassary. */
+while (SSH_AGAIN == rc) {
+rc = ssh_channel_listen_forward(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#else
+rc = ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#endif
+
+if(rc==SSH_OK)
+{
+emit reverseTunnelOk(reverseTunnelRequest[i].creator);
 #ifdef DEBUG
-x2goDebug<<"Listening for TCP/IP connections on 
"<= SSH_VERSION_INT (0, 7, 0)
 }
+#endif
 }
 }
 reverseTunnelRequestMutex.unlock();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 09/18: src/sshmasterconnection.cpp: replace deprecated channel_read () function with ssh_channel_read ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 9c326fd8e54a368aa460a5f41458e6b808ef7554
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:06:22 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_read () function 
with ssh_channel_read ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 317af03..4260f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -588,6 +588,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_poll () function
   with ssh_channel_poll (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_read () function
+  with ssh_channel_read (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index babd71a..5828d0f 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1662,7 +1662,7 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
 #endif
-nbytes = channel_read ( channel, buffer, sizeof ( buffer )-1, 
1 );
+nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer 
)-1, 1 );
 emit stdErr ( channelConnections[i].creator, QByteArray ( 
buffer,nbytes ) );
 #ifdef DEBUG
 //  x2goDebug<

[X2Go-Commits] [x2goclient] 08/18: src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit a34bb98e7f11f8dd4cd2460d64cebb671fccc5f2
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:54:41 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_poll () function 
with ssh_channel_poll ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b192be..317af03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -585,6 +585,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
   function with ssh_channel_request_exec (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_poll () function
+  with ssh_channel_poll (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8417d34..babd71a 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1657,7 +1657,7 @@ void SshMasterConnection::channelLoop()
 ssh_channel channel=channelConnections.at ( i ).channel;
 if ( channel==0l )
 continue;
-if ( channel_poll ( channel,1 ) >0 )
+if ( ssh_channel_poll ( channel,1 ) > 0 )
 {
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
@@ -1668,7 +1668,7 @@ void SshMasterConnection::channelLoop()
 //  x2goDebug<

[X2Go-Commits] [x2goclient] 11/18: src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit d6ef7cfefddafaac535b08f50f6a4b55459d4987
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:10:26 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_write () function 
with ssh_channel_write ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |8 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f133773..fbc1cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -594,6 +594,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
   function with ssh_channel_is_eof (). Might break on ancient systems, but
   we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_write ()
+  function with ssh_channel_write (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 2857e11..91739b8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1746,13 +1746,13 @@ void SshMasterConnection::channelLoop()
 #endif
 if ( nbytes > 0 )
 {
-if ( channel_write ( channel, buffer, nbytes ) !=nbytes )
+if ( ssh_channel_write ( channel, buffer, nbytes ) 
!=nbytes )
 {
 QString err=ssh_get_error ( my_ssh_session );
-QString errorMsg=tr ( "channel_write failed." );
-emit ioErr ( channelConnections[i].creator, errorMsg, 
err );
+QString errorMsg=tr ( "ssh_channel_write failed" );
+emit ioErr ( channelConnections[i].creator, errorMsg + 
".", err );
 #ifdef DEBUG
-x2goDebug<

[X2Go-Commits] [x2goclient] 16/18: src/sshmasterconnection.cpp: fix up some debug strings.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit bd335f0d9ea19019ee91a5f0c5ac6112c606da39
Author: Mihai Moldovan 
Date:   Thu Feb 2 06:56:32 2017 +0100

src/sshmasterconnection.cpp: fix up some debug strings.
---
 debian/changelog|1 +
 src/sshmasterconnection.cpp |8 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b3098f..058393e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -609,6 +609,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: use QString::arg () to insert function name
   and thus deduplicate error translation messages. Also re-add the full
   stop sign and remove it when needed for x2goDebug.
+- src/sshmasterconnection.cpp: fix up some debug strings.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 6469cd7..c2e8659 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -173,9 +173,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, 
QString host, int por
 
 breakLoop=false;
 kerberosDelegation=false;
-x2goDebug << "SshMasterConnection, host " << host << "port " << port << 
"user " << user
-  << "useproxy " << useproxy << "proxyserver " << proxyserver
-  << "proxyport " << proxyport;
+x2goDebug << "SshMasterConnection, host " << host << "; port " << port << 
"; user " << user
+  << "; useproxy " << useproxy << "; proxyserver " << proxyserver
+  << "; proxyport " << proxyport;
 this->host=host;
 this->port=port;
 this->user=user;
@@ -467,7 +467,7 @@ void SshMasterConnection::run()
 #endif
 if(useproxy && proxytype==PROXYSSH)
 {
-x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << 
proxyport << "proxylogin: " << proxylogin;
+x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << 
proxyport << "; proxylogin: " << proxylogin;
 sshProxy=new SshMasterConnection (0, proxyserver, 
proxyport,acceptUnknownServers,
   proxylogin, proxypassword, proxykey, 
proxyautologin, proxyKrbLogin, false);
 connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( 
slotSshProxyConnectionOk() ) );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 17/18: src/sshmasterconnection.cpp: port more occurrences of "QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit fc84c24b51e3d0c9109e58639621294677074308
Author: Mihai Moldovan 
Date:   Thu Feb 2 08:06:03 2017 +0100

src/sshmasterconnection.cpp: port more occurrences of "QString to C string" 
akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |   31 ++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 058393e..789747b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -610,6 +610,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   and thus deduplicate error translation messages. Also re-add the full
   stop sign and remove it when needed for x2goDebug.
 - src/sshmasterconnection.cpp: fix up some debug strings.
+- src/sshmasterconnection.cpp: port more occurrences of "QString to C
+  string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index c2e8659..bd05809 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -541,16 +541,20 @@ void SshMasterConnection::run()
 }
 
 #ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, 
(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
+{
+QByteArray tmp_BA = (mainWnd->getHomeDirectory () + 
"/ssh").toLocal8Bit ();
+
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, tmp_BA.data ());
 #ifdef DEBUG
-x2goDebug<<"Setting SSH directory to 
"<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit();
+x2goDebug << "Setting SSH directory to " << tmp_BA.data ();
 #endif
-if (kerberos)
-{
-parseKnownHosts();
+if (kerberos)
+{
+parseKnownHosts();
+}
 }
-
 #endif
+
 ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, );
 
 ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, );
@@ -652,17 +656,18 @@ void SshMasterConnection::run()
 return;
 }
 
-#ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toLocal8Bit() );
-#else
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toLatin1() );
-#endif
+QByteArray tmp_BA = user.toLocal8Bit ();
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, tmp_BA.data () );
 
 #ifdef Q_OS_WIN
-ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, 
(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit());
+{
+QByteArray tmp_BA = (mainWnd->getHomeDirectory () + 
"/ssh").toLocal8Bit ();
+
+ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, tmp_BA.data () 
);
 #ifdef DEBUG
-x2goDebug<<"Setting SSH directory to 
"<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit();
+x2goDebug << "Setting SSH directory to " << tmp_BA.data ();
 #endif
+}
 #endif
 
 if ( userAuth() )

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 15/18: src/sshmasterconnection.cpp: use QString::arg () to insert function name and thus deduplicate error translation messages.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit b1e826edfef57650de4ccbe48d2967a15ed0587b
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:34:46 2017 +0100

src/sshmasterconnection.cpp: use QString::arg () to insert function name 
and thus deduplicate error translation messages.

Also re-add the full stop sign and remove it when needed for x2goDebug.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   31 ---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc91bbc..2b3098f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -606,6 +606,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_free () function
   with ssh_channel_free (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: use QString::arg () to insert function name
+  and thus deduplicate error translation messages. Also re-add the full
+  stop sign and remove it when needed for x2goDebug.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 21ab275..6469cd7 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1559,11 +1559,12 @@ void SshMasterConnection::channelLoop()
 
 if (!channel) {
 QString err = ssh_get_error (my_ssh_session);
-QString error_msg = tr ("ssh_channel_new failed");
-emit ioErr (channelConnections[i].creator, error_msg + 
".", err);
+/*: Argument in this context will be a function name. */
+QString error_msg = tr ("%1 failed.").arg 
("ssh_channel_new");
+emit ioErr (channelConnections[i].creator, error_msg, err);
 
 #ifdef DEBUG
-x2goDebug << errorMsg << ": " << err << endl;
+x2goDebug << error_msg.left (error_msg.size () - 1) << ": 
" << err << endl;
 #endif
 
 continue;
@@ -1584,10 +1585,10 @@ void SshMasterConnection::channelLoop()
 channelConnections.at ( i 
).localPort ) != SSH_OK )
 {
 QString err=ssh_get_error ( my_ssh_session );
-QString errorMsg=tr ( "ssh_channel_open_forward 
failed" );
-emit ioErr ( channelConnections[i].creator, errorMsg + 
".", err );
+QString errorMsg=tr ( "%1 failed." ).arg 
("ssh_channel_open_forward");
+emit ioErr ( channelConnections[i].creator, errorMsg, 
err );
 #ifdef DEBUG
-x2goDebug<

[X2Go-Commits] [x2goclient] 07/18: src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 6e8faf2a4cec739dfd13de9eec2507be5cc5121c
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:52:29 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_request_exec () 
function with ssh_channel_request_exec ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 907966f..4b192be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -582,6 +582,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
   function with ssh_channel_open_session (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
+  function with ssh_channel_request_exec (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index d671d35..8417d34 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1611,11 +1611,11 @@ void SshMasterConnection::channelLoop()
 x2goDebug<

[X2Go-Commits] [x2goclient] 18/18: src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 5479c31f14af23058d8da9bd357c6e72905d8de7
Author: Mihai Moldovan 
Date:   Thu Feb 2 08:09:08 2017 +0100

src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121.

Shorthands as host names and other bells and whistles like inferred port
or user name values are now supported.
---
 debian/changelog|3 +
 src/sessionwidget.cpp   |   19 --
 src/sshmasterconnection.cpp |  148 +--
 3 files changed, 143 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 789747b..fa1cd0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -612,6 +612,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: fix up some debug strings.
 - src/sshmasterconnection.cpp: port more occurrences of "QString to C
   string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
+- src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config.
+  Fixes: #1121. Shorthands as host names and other bells and whistles like
+  inferred port or user name values are now supported.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 9fd2781..e70aff6 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -84,17 +84,23 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 #else
 QFrame* sgb=this;
 #endif
+const QString ssh_port_tooltip_text = tr ("Values ranging from 0 to 
65535 are allowed."
+  "A value of 0 will 
either use the port specified in the "
+  "SSH configuration file 
belonging to a host or shortname, "
+  "or use the default of 
22.");
 server=new QLineEdit ( sgb );
 uname=new QLineEdit ( sgb );
 sshPort=new QSpinBox ( sgb );
 sshPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-sshPort->setMinimum ( 1 );
-sshPort->setMaximum ( 9 );
+sshPort->setMinimum ( 0 );
+sshPort->setMaximum ( 65535 );
+sshPort->setToolTip (ssh_port_tooltip_text);
 #ifdef Q_OS_LINUX
 rdpPort=new QSpinBox ( sgb );
 rdpPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
-rdpPort->setMinimum ( 1 );
-rdpPort->setMaximum ( 9 );
+rdpPort->setMinimum ( 0 );
+rdpPort->setMaximum ( 65535 );
+rdpPort->setToolTip (ssh_port_tooltip_text);
 #endif
 key=new QLineEdit ( sgb );
 
@@ -156,8 +162,9 @@ SessionWidget::SessionWidget ( bool newSession, QString id, 
ONMainWindow * mw,
 proxyType->addButton(rbHttpProxy);
 proxyHost=new QLineEdit(proxyBox);
 proxyPort=new QSpinBox(proxyBox);
-proxyPort->setMinimum ( 1 );
-proxyPort->setMaximum ( 9 );
+proxyPort->setMinimum ( 0 );
+proxyPort->setMaximum ( 65535 );
+proxyPort->setToolTip (ssh_port_tooltip_text);
 
 cbProxySameUser=new QCheckBox(tr("Same login as on X2Go Server"), 
proxyBox);
 proxyLogin=new QLineEdit(proxyBox);
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index bd05809..46d4f7e 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -195,14 +195,53 @@ SshMasterConnection::SshMasterConnection (QObject* 
parent, QString host, int por
 mainWnd=(ONMainWindow*) parent;
 kerberos=krblogin;
 challengeAuthVerificationCode=QString::null;
-if(this->user==QString::null||this->user.length()<=0)
-{
+
+if (this->user.isEmpty ()) {
+/* We might have a config file request pending, honor this. */
+ssh_session tmp_session = ssh_new ();
+
+if (!tmp_session) {
+QString error_msg = tr ("Cannot create SSH session.");
+error_msg += " " + tr ("Using environment-provided username.");
+#ifdef DEBUG
+x2goDebug << error_msg;
+#endif
+}
+else {
+QByteArray tmp_BA;
+
+if ((useproxy) && (PROXYSSH == proxytype)) {
+tmp_BA = this->proxyserver.toLocal8Bit ();
+}
+else {
+tmp_BA = this->host.toLocal8Bit ();
+}
+
+ssh_options_set (tmp_session, SSH_OPTIONS_HOST, tmp_BA.data ());
+
+if (ssh_options_parse_config (tmp_session, NULL) < 0) {
+x2goDebug << "Warning: unable to parse the SSH config file.";
+}
+
+char *inferred_username = NULL;
+ssh_options_get (tmp_session, SSH_OPTIONS_USER, 
_username);
+x2goDebug << "Temporary session user name after config file parse: 
" << inferred_username;
+
+this->user = QString::fromLocal8Bit (inferred_username);
+
+

[X2Go-Commits] [x2goclient] 03/17: src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 8063573a5363b1a9819528e75ec357e9d7bcaf09
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:36:03 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_new () function 
with ssh_channel_new ().

Might break on ancient systems, but we don't care.

Also, add error handling in case ssh_channel_new () failed...
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cb8bc9f..da6323a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -573,6 +573,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   first place.
 - src/sshmasterconnection.cpp: replace string_free () with its successor
   ssh_string_free (). Will break on ancient systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_new () function
+  with ssh_channel_new (). Might break on ancient systems, but we don't
+  care. Also, add error handling in case ssh_channel_new () failed...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 57c33fa..360925d 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1555,7 +1555,19 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Creating new channel."<

[X2Go-Commits] [x2goclient] 04/17: src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 49e2cd65c436f56646b8f13c15f5ab80944e2ff1
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:45:31 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_open_forward () 
function with ssh_channel_open_forward ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da6323a..277b592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -576,6 +576,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_new () function
   with ssh_channel_new (). Might break on ancient systems, but we don't
   care. Also, add error handling in case ssh_channel_new () failed...
+- src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
+  function with ssh_channel_open_forward (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 360925d..c7d851b 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1577,15 +1577,15 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Forwarding new channel, local port: 
"

[X2Go-Commits] [x2goclient] 06/17: src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 4462ca32dc263af78b05758833a3f0d59ff50d79
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:52:29 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_request_exec () 
function with ssh_channel_request_exec ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c96f70..e84c4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -582,6 +582,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
   function with ssh_channel_open_session (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
+  function with ssh_channel_request_exec (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8ca51b8..2f6d3cc 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1611,11 +1611,11 @@ void SshMasterConnection::channelLoop()
 x2goDebug<

[X2Go-Commits] [x2goclient] 08/17: src/sshmasterconnection.cpp: replace deprecated channel_read () function with ssh_channel_read ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 2ba4653557be21c78a8005a3f8ec64254778d78b
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:06:22 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_read () function 
with ssh_channel_read ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65d63b3..182f22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -588,6 +588,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_poll () function
   with ssh_channel_poll (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_read () function
+  with ssh_channel_read (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 990fb93..dd2df0e 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1662,7 +1662,7 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
 #endif
-nbytes = channel_read ( channel, buffer, sizeof ( buffer )-1, 
1 );
+nbytes = ssh_channel_read ( channel, buffer, sizeof ( buffer 
)-1, 1 );
 emit stdErr ( channelConnections[i].creator, QByteArray ( 
buffer,nbytes ) );
 #ifdef DEBUG
 //  x2goDebug<

[X2Go-Commits] [x2goclient] 09/17: src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function with ssh_channel_is_eof ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 6e894f142458c9f526eeb0acb909e528456706a8
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:08:26 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function 
with ssh_channel_is_eof ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 182f22b..0882e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -591,6 +591,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_read () function
   with ssh_channel_read (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: replace deprecated channel_is_eof ()
+  function with ssh_channel_is_eof (). Might break on ancient systems, but
+  we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index dd2df0e..90a9f7a 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1724,7 +1724,7 @@ void SshMasterConnection::channelLoop()
 continue;
 }
 
-if ( channel_is_eof ( channel ) )
+if ( ssh_channel_is_eof ( channel ) )
 {
 #ifdef DEBUG
 x2goDebug<<"EOF on channel "<pid;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 07/17: src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 2fd60e85b29f705b39291ece9da4efb6aef4ee72
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:54:41 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_poll () function 
with ssh_channel_poll ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e84c4c1..65d63b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -585,6 +585,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
   function with ssh_channel_request_exec (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_poll () function
+  with ssh_channel_poll (). Might break on ancient systems, but we don't
+  care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 2f6d3cc..990fb93 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1657,7 +1657,7 @@ void SshMasterConnection::channelLoop()
 ssh_channel channel=channelConnections.at ( i ).channel;
 if ( channel==0l )
 continue;
-if ( channel_poll ( channel,1 ) >0 )
+if ( ssh_channel_poll ( channel,1 ) > 0 )
 {
 #ifdef DEBUG
 //  x2goDebug<<"read err data from channel\n";
@@ -1668,7 +1668,7 @@ void SshMasterConnection::channelLoop()
 //  x2goDebug<

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (0ba2e55 -> 5479c31)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  discards  0ba2e55   src/sshmasterconnection.cpp: enable parsing of 
~/.ssh/config. Fixes: #1121.
  discards  148f236   src/sshmasterconnection.cpp: port more occurrences of 
"QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd.
  discards  a8b9e3c   src/sshmasterconnection.cpp: fix up some debug strings.
  discards  9aa514c   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
  discards  58ff99d   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
  discards  bfbc01f   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
  discards  b53ea01   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
  discards  1920cfd   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
  discards  7e87053   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
  discards  5b3e174   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
  discards  bc6dd6e   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
  discards  d9ee965   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
  discards  456c140   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
  discards  d5edf53   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
  discards  a23a3db   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
  discards  e8d67c4   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
  discards  0b9f140   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () (0.7.4 and higher) or 
ssh_get_publickey () (0.7.3 and lower) and its hash via ssh_get_publickey_hash 
() instead of using the deprecated ssh_get_pubkey_hash () function.
  discards  64abe5a   src/sshmasterconnection.cpp: use 
ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh 
versions. Fixes: #870.
  adds  b114c54   res/i18n/x2goclient_es.ts: update Spanish translation 
file.
  adds  ec534c7   res/i18n/x2goclient_es.ts: fixup Spanish translation file 
where necessary and add comments/requests for re-translations for the next time.
   new  93dd915   src/sshmasterconnection.cpp: use 
ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh 
versions. Fixes: #870.
   new  d8d30e3   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () (0.7.4 and higher) or 
ssh_get_publickey () (0.7.3 and lower) and its hash via ssh_get_publickey_hash 
() instead of using the deprecated ssh_get_pubkey_hash () function.
   new  530a5e6   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
   new  d1e7566   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
   new  0c9dc98   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
   new  e753fe2   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
   new  6e8faf2   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
   new  a34bb98   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
   new  9c326fd   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
   new  6770e23   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
   new  d6ef7cf   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
   new  9ab0859   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
   new  a5ecc9f   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
   new  ae43804   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
   new  b1e826e   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
   new  bd335f0   

[X2Go-Commits] [x2goclient] 03/18: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 530a5e6e3afd372c1632b280abc171f4748f001b
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:15:38 2017 +0100

src/sshmasterconnection.cpp: replace string_free () with its successor 
ssh_string_free ().

Will break on ancient systems, but we don't care.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b1d9fee..b6c2ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -571,6 +571,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   ssh_get_hexa (). This will break on very old systems with a hopelessly
   outdated libssh version, but we do not care about these systems in the
   first place.
+- src/sshmasterconnection.cpp: replace string_free () with its successor
+  ssh_string_free (). Will break on ancient systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 99e35df..57ca78c 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1192,7 +1192,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
 privatekey_free(prkey);
-string_free(pubkeyStr);
+ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
 x2goDebug<<"Authenticating with key: "<

[X2Go-Commits] [x2goclient] 02/04: res/i18n/x2goclient_es.ts: remove obsolete comments and very minor whitespace fixup.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3131bde6dbcb06aa4bd310c738d578934e981634
Author: Mihai Moldovan 
Date:   Thu Feb 9 05:37:42 2017 +0100

res/i18n/x2goclient_es.ts: remove obsolete comments and very minor 
whitespace fixup.
---
 debian/changelog  |2 ++
 res/i18n/x2goclient_es.ts |   12 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f0e64b..691e377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -560,6 +560,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - res/i18n/x2goclient_es.ts: fixup Spanish translation file where
   necessary and add comments/requests for re-translations for the next
   time.
+- res/i18n/x2goclient_es.ts: remove obsolete comments and very minor
+  whitespace fixup.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 1a79305..892f201 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -1300,7 +1300,6 @@ el sonido en conexiones a través de 
firewalls
 ARTS support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-Please dont forget the second line!
 El soporte ARTS está previsto sea eliminado en breve.
 
 Por favor actualiza a PulseAudio.
@@ -1310,7 +1309,6 @@ Por favor actualiza a PulseAudio.
 ESounD support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-Please dont forget the second line!
 El soporte ESounD está previsto sea eliminado en breve.
 
 Por favor actualiza a PulseAudio.
@@ -2892,8 +2890,6 @@ Si el ejecutable del servidro sftp está instalado en tu 
sistema, por favor repo
 
 
 SSH key base directory creation error
-The error isnt really about the SSH key creation 
itself, but about the *base* directory.
-Ok, my original translation wasnt so 
specific
 Error al crear la clave SSH en el directorio 
predeterminado
 
 
@@ -2914,25 +2910,21 @@ Si el ejecutable del servidro sftp está instalado en tu 
sistema, por favor repo
 
 
 ssh-keygen crashed
-Please be more specific, crashed doesnt 
mean execute...
 fallo durante la ejecución de ssh-keygen
 
 
 
 The ssh-keygen binary crashed.
-Please be more specific, crashed doesnt 
mean execute...
 fallo durante la ejecución de ssh-keygen.
 
 
 
 ssh-keygen program error
-Please be more specific, program error 
doesnt mean execute...
 fallo durante la ejecución de ssh-keygen
 
 
 
 The ssh-keygen binary did not exit cleanly.
-Please be more specific, unclean termination 
doesnt mean execute...
 La ejecución de ssh-keygen finalizó de manera 
anormal.
 
 
@@ -2952,7 +2944,7 @@ Si el ejecutable del servidro sftp está instalado en tu 
sistema, por favor repo
 %1 public host key file empty.
 %1 in this context will be replaced with the SSH key type 
(e.g., RSA, DSA or the like.) Please make sure that the 
translation is correct in this regard.
  Also, please include the host part, to make clear 
that were not talking about client keys here.
-archivo de clave pública %1 en el lado del servidor 
remoto vacío .
+archivo de clave pública %1 en el lado del servidor 
remoto vacío.
 
 
 
@@ -3608,8 +3600,6 @@ Ejemplo:
 
 
 Unable to find the PulseAudio binary. Neither bundled, nor 
found in $PATH nor additional directories.
-Were not only searching for a bundled PA version or one 
in $PATH, but also other (non-disclosed) directories. That should be 
communicated.
-Its properly translated
 No se ha encontrado el ejecutable de PulseAudio. Ni el 
incorpodado ni en el $PATH local.
 
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 03/04: res/i18n/x2goclient_de.ts: update German translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 6ef548f956b70420c7fbcf4f59071e24756c32b5
Author: Stefan Baur 
Date:   Thu Feb 9 06:16:52 2017 +0100

res/i18n/x2goclient_de.ts: update German translation file.
---
 debian/changelog  |4 +
 res/i18n/x2goclient_de.ts |  212 +
 2 files changed, 122 insertions(+), 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 691e377..30249dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -594,6 +594,10 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - res/i18n/x2goclient_es.ts: update Spanish translation file.
 - res/i18n/x2goclient_es.ts: update Spanish translation file.
 
+  [ Stefan Baur ]
+  * New upstream release (4.1.0.0):
+- res/i18n/x2goclient_de.ts: update German translation file.
+
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index 84ca6eb..a04ff42 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -490,12 +490,12 @@
 
 
 PulseAudio settings
-
+PulseAudio-Einstellungen
 
 
 
 Disable sound input
-
+Audio-Eingang deaktivieren
 
 
 
@@ -1179,217 +1179,217 @@ sound system connections through firewalls
 
 
 Shows this message.
-
+Zeigt diese Nachricht an.
 
 
 
 Prints version information.
-
+Zeigt die Versionsinformationen an.
 
 
 
 Shows the changelog.
-
+Zeigt das Changelog an.
 
 
 
 Shows git information as used at compile time. [Deprecated: 
please use --version.]
-
+Zeigt Git-Informationen an, die zur Compile-Zeit benutzt 
wurden. [Veraltet: bitte --version benutzen.]
 
 
 
 Shows available pack methods.
-
+Zeigt verfügbare Komprimierungsmethoden an.
 
 
 
 Do not resume sessions automatically.
-
+Sitzungen nicht automatisch wiederverbinden.
 
 
 
 Hides menu bar.
-
+Blendet die Menüleiste aus.
 
 
 
 Disables session editing.
-
+Verhindert das Bearbeiten der 
Sitzungseinstellungen.
 
 
 
 Starts maximized.
-
+Maximiert starten.
 
 
 
 Starts hidden (minimized to system tray where 
available.)
-
+Versteckt starten (In den Systray minimieren, wenn 
verfügbar)
 
 
 
 Starts in portable mode.
-
+Im portablen Modus starten.
 
 
 
 Forces OpenPGP smart card authentication.
-
+OpenPGP-Smartcard-Authentisierung erzwingen.
 
 
 
 Enables Xinerama by default.
-
+Xinerama standardmäßig aktivieren.
 
 
 
 Allows client side printing in LDAP mode.
-
+Clientseitige Druckerunterstützung im LDAP-Modus 
erlauben.
 
 
 
 Enables thinclient mode. Starts without a window 
manager.
-
+Aktiviert den Thinclient-Modus. Start erfolgt ohne 
Window-Manager.
 
 
 
 Enables shutdown button.
-
+Shutdown-Knopf darstellen.
 
 
 
 Adds RSA key fingerprint to .ssh/known_hosts if 
authenticity of the server cant be determined.
-
+Fügt den Fingerabdruck des RSA-Schlüssels in die 
.ssh/known_hosts-Datei ein, wenn die Authentizität des Hosts nicht 
bestimmt werden kann.
 
 
 
 Starts with LDAP support. Example: 
--ldap=ldapserver:389:o=organization,c=de
-
+Mit LDAP-Unterstützung starten. Beispiel: 
--ldap=ldapserver:389:o=organisation,c=de
 
 
 
 Defines the first LDAP failover server.
-
+Legt den ersten LDAP-Failover-Server fest.
 
 
 
 Defines the second LDAP failover server.
-
+Legt den zweiten LDAP-Failover-Server fest.
 
 
 
 Defines the remote SSH server port. Default: 22.
-
+Legt den entfernten SSH-Server-Port fest. Standard: 
22.
 
 
 
 Defines the local machines SSH server port. Needed for 
Client-Side Printing and File Sharing support. Default: 22.
-
+Legt den SSH-Server-Port des lokalen Systems fest. Wird 
für clientseitiges Drucken und Dateiaustausch benötigt. Standard: 
22.
 
 
 
 Sets the default command. Default: KDE (Desktop 
Session)
-
+Setzt das Standardkommando. Standard: KDE 

[X2Go-Commits] [x2goclient] 01/04: res/i18n/x2goclient_es.ts: update Spanish translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 44708d62a2aacff80d190fb8ab0eafcc596a21f0
Author: Ricardo Díaz Martín 
Date:   Thu Feb 9 05:16:28 2017 +0100

res/i18n/x2goclient_es.ts: update Spanish translation file.
---
 debian/changelog  |1 +
 res/i18n/x2goclient_es.ts |   64 ++---
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 705916b..0f0e64b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -590,6 +590,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   [ Ricardo Díaz Martín ]
   * New upstream release (4.1.0.0):
 - res/i18n/x2goclient_es.ts: update Spanish translation file.
+- res/i18n/x2goclient_es.ts: update Spanish translation file.
 
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 8abeaca..1a79305 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -1300,16 +1300,20 @@ el sonido en conexiones a través de 
firewalls
 ARTS support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-Please don't forget the second line!
-El soporte ARTS está previsto sea 
eliminado en breve.
+Please dont forget the second line!
+El soporte ARTS está previsto sea eliminado en breve.
+
+Por favor actualiza a PulseAudio.
 
 
 
 ESounD support is scheduled to be removed soon.
 
 Please upgrade to PulseAudio.
-Please don't forget the second line!
-El soporte ESounD está previsto sea 
eliminado en breve.
+Please dont forget the second line!
+El soporte ESounD está previsto sea eliminado en breve.
+
+Por favor actualiza a PulseAudio.
 
 
 
@@ -2459,7 +2463,7 @@ Actualiza el paquete x2goserver en el 
servidor
 
 
 Non-fatal: cant load translator: 
-Error no fatal: no se puede cargar el traductor. 

+Error no fatal: no se puede cargar el traductor: 

 
 
 
@@ -2841,17 +2845,17 @@ Los documentos no guardados se perderán.
 
 
 Unable to change the permissions of directory: 
-
+Imposible cambiar los permisos del directorio: 

 
 
 
 This is an error because sshd would deny such a 
directory.
-
+Este error se ha producido porque el servicio sshd no 
permite el acceso al directorio.
 
 
 
 Unable to find the sftp-server binary. Neither bundled, nor 
found in $PATH nor additional directories.
-
+Imposible encontrar el ejecutable del servidor sftp. No 
se encuentra el que viene incluído ni en otros directorios $PATH.
 
 
 
@@ -2860,7 +2864,11 @@ Los documentos no guardados se perderán.
 If the sftp-server binary is installed on your system, please report a bug 
mentioning its path on:
 centera 
href=https://wiki.x2go.org/doku.php/wiki:bugshttps://wiki.x2go.org/doku.php/wiki:bugs/a/center;
 
-
+Si estás usando Linux pídele al administrador que instale 
el paquete que contiene el ejecutable del servidor sftp. Los nombres más 
comunes son bopenssh/b, bopenssh-server/b or 
bopenssh-sftp-server/b dependiendo de la distribución usada.
+
+Si el ejecutable del servidro sftp está instalado en tu sistema, por favor 
reporta el bug mencionando su ruta en:
+centera 
href=https://wiki.x2go.org/doku.php/wiki:bugshttps://wiki.x2go.org/doku.php/wiki:bugs/a/center;
+
 
 
 
@@ -2884,8 +2892,9 @@ If the sftp-server binary is installed on your system, 
please report a bug menti
 
 
 SSH key base directory creation error
-The error isn't really about the SSH key creation itself, but 
about the *base* directory.
-Error al crear la clave 
SSH
+The error isnt really about the SSH key creation 
itself, but about the *base* directory.
+Ok, my original translation wasnt so 
specific
+Error al crear la clave SSH en el directorio 
predeterminado
 
 
 
@@ -2905,26 +2914,26 @@ If the sftp-server binary is installed on your system, 
please report a bug menti
 
 
 ssh-keygen crashed
-Please be more specific, "crashed" doesn't mean 
"execute"...
-fallo al ejecutar 
ssh-keygen
+Please be more specific, crashed doesnt 
mean execute...
+fallo durante la ejecución de ssh-keygen
 
 
 
 The ssh-keygen binary crashed.
-Please be more specific, "crashed" doesn't mean 
"execute"...
-fallo al ejecutar 
ssh-keygen.
+Please be more specific, crashed doesnt 
mean execute...
+fallo durante la ejecución de ssh-keygen.
 
 
 
 ssh-keygen program error
-Please 

[X2Go-Commits] [x2goclient] branch master updated (ec534c7 -> b5435f5)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  ec534c7   res/i18n/x2goclient_es.ts: fixup Spanish translation file 
where necessary and add comments/requests for re-translations for the next time.
   new  44708d6   res/i18n/x2goclient_es.ts: update Spanish translation 
file.
   new  3131bde   res/i18n/x2goclient_es.ts: remove obsolete comments and 
very minor whitespace fixup.
   new  6ef548f   res/i18n/x2goclient_de.ts: update German translation file.
   new  b5435f5   res/i18n/x2goclient_de.ts: fixup German translation file, 
including typo, whitespace, grammar fixes and other stuff.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |9 ++
 res/i18n/x2goclient_de.ts |  221 ++---
 res/i18n/x2goclient_es.ts |   54 +--
 3 files changed, 163 insertions(+), 121 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 04/04: res/i18n/x2goclient_de.ts: fixup German translation file, including typo, whitespace, grammar fixes and other stuff.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b5435f5dc27d59db6ac77adf3d460b1c7733ab68
Author: Mihai Moldovan 
Date:   Thu Feb 9 06:33:42 2017 +0100

res/i18n/x2goclient_de.ts: fixup German translation file, including typo, 
whitespace, grammar fixes and other stuff.
---
 debian/changelog  |2 ++
 res/i18n/x2goclient_de.ts |   53 ++---
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30249dc..9239577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -562,6 +562,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time.
 - res/i18n/x2goclient_es.ts: remove obsolete comments and very minor
   whitespace fixup.
+- res/i18n/x2goclient_de.ts: fixup German translation file, including
+  typo, whitespace, grammar fixes and other stuff.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index a04ff42..e2b5081 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -1229,7 +1229,7 @@ sound system connections through firewalls
 
 
 Starts in portable mode.
-Im portablen Modus starten.
+Im portablen Modus starten.
 
 
 
@@ -1319,7 +1319,7 @@ sound system connections through firewalls
 
 
 Sets default pack method. Default: 
16m-jpeg-9.
-Setzt die zu verwendende Komprimierungsmethode. Standard: 
16m-jpeg.9.
+Setzt die zu verwendende Komprimierungsmethode. Standard: 
16m-jpeg-9.
 
 
 
@@ -1349,7 +1349,7 @@ sound system connections through firewalls
 
 
 Automatically launches the application(s) app, 
app2, ... on session start in Published Applications mode.
-Startet im Veröffentlichte-Anwendungen-Modus beim 
Sitzungsstart automatisch die Anwendung(en) app, app2, 
... .
+Startet im Veröffentlichte-Anwendungen-Modus beim 
Sitzungsstart automatisch die Anwendung(en) app, app2, 
...
 
 
 
@@ -1389,7 +1389,7 @@ sound system connections through firewalls
 
 
 Does not ask for user credentials during session broker 
authentication. This can be useful if you are using an HTTP(S) session broker 
without authentication. If you run an HTTP(S) server without authentication, 
but with user-specific profiles, then put the user name into the broker URL 
(refer to --broker-url.) The user name then will be extracted from the broker 
URL and be sent to the session broker. The clients behavior is undefined 
if this flag is used for non-HTT [...]
-Fragt keine Benutzerdaten für die Authentisierung am 
Session-Broker ab. Das kann nützlich sein, wenn man einen 
HTTP(S)-Session-Broker verwendet, der keine Authentisierung nutzt. Bei der 
Verwendung eines HTTP(S)-Servers ohne Authentisierung, aber mit 
benutzerspezifischen Profilen bitte den Benutzernamen in die Broker-URL 
einfügen (siehe --broker-url). Der Benutzername wird dann aus der Broker-URL 
extrahiert und an den Session Broker übergeben. Das Verhalten des Client [...]
+Fragt keine Benutzerdaten für die Authentisierung am 
Session-Broker ab. Das kann nützlich sein, wenn man einen 
HTTP(S)-Session-Broker verwendet, der keine Authentisierung nutzt. Bei der 
Verwendung eines HTTP(S)-Servers ohne Authentisierung, aber mit 
benutzerspezifischen Profilen bitte den Benutzernamen in die Broker-URL 
einfügen (siehe --broker-url). Der Benutzername wird dann aus der Broker-URL 
extrahiert und an den Session-Broker übergeben. Das Verhalten des Client [...]
 
 
 
@@ -2426,17 +2426,17 @@ Bitte melden Sie den Fehler wie auf der a 
href=http://wiki.x2go.org/do
 
 
 br(C) 2005-2017 by bobviously nice/b: 
Oleksandr Shneyder, Heinz-Markus Graesingbr
-br (C) 2005-2017 by bobviously 
nice/b: Oleksandr Shneyder, Heinz-Markus 
Graesingbr
+br(C) 2005-2017 by bobviously 
nice/b: Oleksandr Shneyder, Heinz-Markus 
Graesingbr
 
 
 
 Unable to create or append to file: 
-Datei konnte nicht angelegt oder zum Anhängen geöffnet 
werden:
+Datei konnte nicht angelegt oder zum Anhängen geöffnet 
werden: 
 
 
 
 Unable to change the permissions of file: 
-Kann Dateirechte nicht ändern:
+Kann Dateirechte nicht ändern: 
 
 
 
@@ -2446,7 +2446,7 @@ Bitte melden Sie den Fehler wie auf der a 
href=http://wiki.x2go.org/do
 
 
 Unable to change the permissions of directory: 
-Kann Verzeichnisrechte nicht ändern:
+Kann Verzeichnisrechte nicht ändern: 
 
 
 
@@ -2456,7 +2456,7 @@ Bitte melden Sie den Fehler wie auf der a 
href=http://wiki.x2go.org/do
 
 
 Unable to find the 

[X2Go-Commits] [x2goclient] branch bugfix/typos updated (40be528 -> 21f3c45)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch bugfix/typos
in repository x2goclient.

  from  40be528   src/onmainwindow.cpp: correctly guard the new lines from 
the previous commit.
   new  771efe8   src/{onmainwindow,httpbrokerclient}.cpp: fix up 
error/warning message displayed when the server-specified key is unknown, but 
we have another key type stored already.
   new  21f3c45   src/pulsemanager.cpp: fix up a debug string.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |6 ++
 src/httpbrokerclient.cpp |2 +-
 src/onmainwindow.cpp |2 +-
 src/pulsemanager.cpp |2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/02: src/pulsemanager.cpp: fix up a debug string.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/typos
in repository x2goclient.

commit 21f3c4516f82adf276357cb241c5dbf5fa4f
Author: Mihai Moldovan 
Date:   Fri Feb 3 02:00:59 2017 +0100

src/pulsemanager.cpp: fix up a debug string.

Qt drops a space where I'd like to have one and inserts a space where
I'd like none, so work around that fancifully.
---
 debian/changelog |3 +++
 src/pulsemanager.cpp |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98c4d4d..cc9bcda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -560,6 +560,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message
   displayed when the server-specified key is unknown, but we have another
   key type stored already.
+- src/pulsemanager.cpp: fix up a debug string. Qt drops a space where I'd
+  like to have one and inserts a space where I'd like none, so work around
+  that fancifully.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 30c2262..c050e01 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -229,7 +229,7 @@ void PulseManager::start_generic () {
* Otherwise, we'd better use signals and slots to not block the main thread.
*/
   if (pulse_server_->waitForStarted (-1)) {
-x2goDebug << "pulse started with arguments" << server_args_ << "; waiting 
for finish...";
+x2goDebug << "pulse started with arguments " << server_args_ << "- waiting 
for it to finish...";
 state_ = QProcess::Running;
 
 connect (pulse_server_, SIGNAL (finished (int)),

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: src/{onmainwindow, httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored alread

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/typos
in repository x2goclient.

commit 771efe85d99c726c42143f0b2077f0beec3aff60
Author: Mihai Moldovan 
Date:   Thu Feb 2 18:00:28 2017 +0100

src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message 
displayed when the server-specified key is unknown, but we have another key 
type stored already.
---
 debian/changelog |3 +++
 src/httpbrokerclient.cpp |2 +-
 src/onmainwindow.cpp |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad063a..98c4d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -557,6 +557,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time (for instance when running x2goclient --help.)
 - src/onmainwindow.cpp: correctly guard the new lines from the previous
   commit. Fixes compile issues on Linux and other systems.
+- src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message
+  displayed when the server-specified key is unknown, but we have another
+  key type stored already.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 1af824e..7ea6ccf 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -141,7 +141,7 @@ void HttpBrokerClient::slotSshServerAuthError(int error, 
QString sshMessage, Ssh
 return;
 
 case SSH_SERVER_FOUND_OTHER:
-errMsg=tr ( "The host key for this server was not found but another"
+errMsg=tr ( "The host key for this server was not found but another "
 "type of key exists. An attacker might have changed the 
default server key to "
 "trick your client into thinking the key does not exist 
yet." );
 connection->writeKnownHosts(false);
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 604d25d..e1ae22c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3093,7 +3093,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, 
QString sshMessage, SshMa
 }
 break;
 case SSH_SERVER_FOUND_OTHER:
-errMsg=tr ( "The host key for this server was not found but another"
+errMsg=tr ( "The host key for this server was not found but another "
 "type of key exists. An attacker might have changed the 
default server key to "
 "trick your client into thinking the key does not exist 
yet.\n"
 "For security reasons, it is recommended to stop the 
connection attempt.\n"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch bugfix/typos created (now 40be528)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch bugfix/typos
in repository x2goclient.

at  40be528   src/onmainwindow.cpp: correctly guard the new lines from 
the previous commit.

No new revisions were added by this update.

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] branch master updated (3815b4a -> 4ec39d0)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2gobroker.

  from  3815b4a   Continue development
   new  4ec39d0   debian/x2gobroker-loadchecker.service: Fix flawed symlink 
actually still pointing to the authservice's service file. Thanks to Niels 
Rogalla for spotting this. (Fixes: #1141).

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |5 -
 debian/x2gobroker-loadchecker.service |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2gobroker] 01/01: debian/x2gobroker-loadchecker.service: Fix flawed symlink actually still pointing to the authservice's service file. Thanks to Niels Rogalla for spotting this. (Fixe

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 4ec39d08196c2bcf3bb922854ab6f1f035798690
Author: Mike Gabriel 
Date:   Sat Feb 4 23:39:28 2017 +0100

debian/x2gobroker-loadchecker.service: Fix flawed symlink actually still 
pointing to the authservice's service file. Thanks to Niels Rogalla for 
spotting this. (Fixes: #1141).
---
 debian/changelog  |5 -
 debian/x2gobroker-loadchecker.service |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3473e65..97f905a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 x2gobroker (0.0.3.2-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  * debian/x2gobroker-loadchecker.service:
++ Fix flawed symlink actually still pointing to the authservice's
+  service file. Thanks to Niels Rogalla for spotting this.
+  (Fixes: #1141).
 
  -- X2Go Release Manager   Thu, 01 Dec 2016 23:07:26 +0100
 
diff --git a/debian/x2gobroker-loadchecker.service 
b/debian/x2gobroker-loadchecker.service
index 426059a..d92c483 12
--- a/debian/x2gobroker-loadchecker.service
+++ b/debian/x2gobroker-loadchecker.service
@@ -1 +1 @@
-../x2gobroker-authservice.service
\ No newline at end of file
+../x2gobroker-loadchecker.service
\ No newline at end of file

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2gobroker.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/02: res/i18n/x2goclient_fr.ts: fixup French translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 459f08052fc646aa3b788cc77d1f7d086f6ca8f7
Author: Mihai Moldovan 
Date:   Sun Jan 22 18:40:03 2017 +0100

res/i18n/x2goclient_fr.ts: fixup French translation file.
---
 debian/changelog  |1 +
 res/i18n/x2goclient_fr.ts |7 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0feb63a..3766b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -542,6 +542,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - res/i18n/: refresh translation files.
 - deduplicate.sh: remove file, now obsolete and merged into macbuild.sh.
 - res/i18n/: refresh translation files again after copyright date changes.
+- res/i18n/x2goclient_fr.ts: fixup French translation file.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index 7367082..dfb8161 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -418,7 +418,7 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 PulseAudio settings
-Paramétrage de Pulseaudio
+Paramétrage de PulseAudio
 
 
 Disable sound input
@@ -674,7 +674,8 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 Shows git information as used at compile time. [Deprecated: 
please use --version.]
-Montre les informations git utilisées au moment de la 
compilation
+Please dont exclude the depcration 
notice.
+Montre les informations git utilisées 
au moment de la compilation.
 
 
 Shows available pack methods.
@@ -2425,7 +2426,7 @@ Veuillez rapporter le bug sur :
 
 
 br(C) 2005-2017 by bobviously nice/b: 
Oleksandr Shneyder, Heinz-Markus Graesingbr
-br(C) 2005-2016 par bobviously 
nice/b: Oleksandr Shneyder, Heinz-Markus 
Graesingbr
+br(C) 2005-2017 par bobviously 
nice/b: Oleksandr Shneyder, Heinz-Markus 
Graesingbr
 
 
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: res/i18n/x2goclient_fr.ts: update French translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b3c5acd0bac206d12893253b08f59c0de437d1ee
Author: Sébastien Ducoulombier 
Date:   Sun Jan 22 18:36:20 2017 +0100

res/i18n/x2goclient_fr.ts: update French translation file.
---
 debian/changelog  |4 +
 res/i18n/x2goclient_fr.ts |  301 +
 2 files changed, 171 insertions(+), 134 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd6c6f8..0feb63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -561,6 +561,10 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.0):
 - src/onmainwindow.cpp: fix SSHFS on Windows client. Fixes: #1105.
 
+  [ Sébastien Ducoulombier ]
+  * New upstream version (4.1.0.0):
+- res/i18n/x2goclient_fr.ts: update French translation file.
+
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index aaef578..7367082 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -1,6 +1,6 @@
 
 
-
+
 
 AppDialog
 
@@ -9,7 +9,7 @@
 
 
 Search:
-Rechercher:
+Rechercher :
 
 
 Start
@@ -72,15 +72,15 @@
 
 
 Old password:
-Ancien mot de passe:
+Ancien mot de passe :
 
 
 New password:
-Nouveau mot de passe:
+Nouveau mot de passe :
 
 
 Confirm password:
-Confirmez le mot de passe:
+Confirmez le mot de passe :
 
 
 TextLabel
@@ -219,23 +219,23 @@
 
 
 Display icon in system tray
-Afficher licone dans la barre des 
tâches
+Afficher licone dans la barre 
détat
 
 
 Hide to system tray when minimized
-Cacher dans la barre des tâches à la réduction de la 
fenêtre
+Cacher dans la barre détat à la réduction de la 
fenêtre
 
 
 Hide to system tray when closed
-Cacher dans la barre des tâches à la fermeture de la 
fenêtre
+Cacher dans la barre détat à la fermeture de la 
fenêtre
 
 
 Hide to system tray after connection is established
-Cacher dans la barre des tâches quand la session est 
établie
+Cacher dans la barre détat quand la session est 
établie
 
 
 Restore from system tray after session is disconnected
-Cacher dans la barre des tâches quand la session est 
déconnectée
+Cacher dans la barre détat quand la session est 
déconnectée
 
 
 Use LDAP
@@ -243,20 +243,20 @@
 
 
 Server URL:
-URL du serveur:
+URL du serveur :
 
 
 BaseDN:
-BaseDN:
+BaseDN :
 
 
 Failover server 1 URL:
 Failover en backup ? secours 
plutôt.
-URL du premier serveur de secours:
+URL du premier serveur de secours :
 
 
 Failover server 2 URL:
-URL du second serveur de secours:
+URL du second serveur de secours :
 
 
 X-Server settings
@@ -264,11 +264,11 @@
 
 
 X11 application:
-Application X11:
+Application X11 :
 
 
 X11 version:
-Version X11:
+Version X11 :
 
 
 Find X11 application
@@ -418,11 +418,11 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 PulseAudio settings
-
+Paramétrage de Pulseaudio
 
 
 Disable sound input
-
+Désactiver lentrée son
 
 
 
@@ -433,7 +433,7 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 Connection speed:
-Vitesse de connection:
+Vitesse de connection :
 
 
 Compression
@@ -442,15 +442,15 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 Method:
-Méthode:
+Méthode :
 
 
 Compression method:
-Méthode de compression:
+Méthode de compression :
 
 
 Image quality:
-Qualité dimage:
+Qualité dimage :
 
 
 
@@ -465,15 +465,15 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 
 
 Page size:
-Taille de page:
+Taille de page :
 
 
 Paper type:
-Type de papier:
+Type de papier :
 
 
 Paper source:
-Source de papier:
+Source de papier :
 
 
 Duplex Printing
@@ -662,175 +662,175 @@ Vous la trouverez peut-être dans lun de ces 
emplacements standards :
 Help
 
 Shows this message.
-
+Montre ce message.
 
 
 Prints version 

[X2Go-Commits] [x2goclient] branch master updated (8b5fc72 -> 459f080)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  8b5fc72   res/i18n/: refresh translation files again after 
copyright date changes.
   new  b3c5acd   res/i18n/x2goclient_fr.ts: update French translation file.
   new  459f080   res/i18n/x2goclient_fr.ts: fixup French translation file.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |5 +
 res/i18n/x2goclient_fr.ts |  302 +
 2 files changed, 173 insertions(+), 134 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: res/i18n/x2goclient_sv.ts: update Swedish translation file.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 9791c2db703f9d58ec096f4edd6a16be51399cfe
Author: Daniel Lindgren 
Date:   Mon Jan 23 09:18:22 2017 +0100

res/i18n/x2goclient_sv.ts: update Swedish translation file.
---
 debian/changelog  |4 +
 res/i18n/x2goclient_sv.ts |  221 ++---
 2 files changed, 130 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3766b15..6d0e448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -566,6 +566,10 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.0):
 - res/i18n/x2goclient_fr.ts: update French translation file.
 
+  [ Daniel Lindgren ]
+  * New upstream version (4.1.0.0):
+- res/i18n/x2goclient_sv.ts: update Swedish translation file.
+
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium
diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts
index 4c56be5..e260fa4 100644
--- a/res/i18n/x2goclient_sv.ts
+++ b/res/i18n/x2goclient_sv.ts
@@ -331,12 +331,12 @@
 
 
 PulseAudio settings
-
+PulseAudio inställningar
 
 
 
 Disable sound input
-
+Deaktivera ljudinmatning
 
 
 Clientside (local) SSH daemon port for file system export 
usage:
@@ -810,217 +810,217 @@ Några vanliga installationssökvägar är:
 
 
 Shows this message.
-
+Visar detta meddelande.
 
 
 
 Prints version information.
-
+Visar versionsinformation.
 
 
 
 Shows the changelog.
-
+Visar ändringsloggen.
 
 
 
 Shows git information as used at compile time. [Deprecated: 
please use --version.]
-
+Visar git-information som användes vid kompilering. 
[Inaktuell: var vänlig använd --version.]
 
 
 
 Shows available pack methods.
-
+Visar tillgängliga packningsmetoder.
 
 
 
 Do not resume sessions automatically.
-
+Återuppta inte sessioner automatiskt.
 
 
 
 Hides menu bar.
-
+Döljer menyraden.
 
 
 
 Disables session editing.
-
+Inaktivera sessionsredigering.
 
 
 
 Starts maximized.
-
+Startar maximerad.
 
 
 
 Starts hidden (minimized to system tray where 
available.)
-
+Startar dold (minimerad till systemfältet om det 
finns.)
 
 
 
 Starts in portable mode.
-
+Startar i portabelt läge.
 
 
 
 Forces OpenPGP smart card authentication.
-
+Tvingar OpenPGP smartkortsautenticering.
 
 
 
 Enables Xinerama by default.
-
+Aktivera Xinerama som standard.
 
 
 
 Allows client side printing in LDAP mode.
-
+Tillåt klientutskrifter i LDAP-läge.
 
 
 
 Enables thinclient mode. Starts without a window 
manager.
-
+Aktiverar tunn klient-läge. Startar utan 
fönsterhanterare.
 
 
 
 Enables shutdown button.
-
+Aktivera Avsluta-knapp.
 
 
 
 Adds RSA key fingerprint to .ssh/known_hosts if 
authenticity of the server cant be determined.
-
+Sparar fingeravtryck för RSA-nyckel i 
.ssh/knows_hosts om serverns identitet inte kan 
fastställas.
 
 
 
 Starts with LDAP support. Example: 
--ldap=ldapserver:389:o=organization,c=de
-
+Startar med LDAP-support. Exempel: 
--ldap=ldapserver:389:o=organization,c=se
 
 
 
 Defines the first LDAP failover server.
-
+Anger första LDAP failoverserver.
 
 
 
 Defines the second LDAP failover server.
-
+Anger andra LDAP failoverserver.
 
 
 
 Defines the remote SSH server port. Default: 22.
-
+Anger fjärrserverns SSH-port. Standardinställning: 
22.
 
 
 
 Defines the local machines SSH server port. Needed for 
Client-Side Printing and File Sharing support. Default: 22.
-
+Anger lokal SSH serverport. Behövs för klientutskrifter 
och fildelning. Standardinställning: 22.
 
 
 
 Sets the default command. Default: KDE (Desktop 
Session)
-
+Sätter standardkommando. Standardinställning: 
KDE (skrivbordsession)
 
 
 
 Starts the session named session.
-
+Startar sessionen med namnet 
session.
 
 
 
 Sets 

[X2Go-Commits] [x2goclient] 02/02: res/i18n/x2goclient_sv.ts: fixup Swedish translation file a little bit and add comments/requests for re-translations for the next time.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 1ccbe81698fc2ccf96d9b0b5ba239dc6f916bf58
Author: Mihai Moldovan 
Date:   Mon Jan 23 09:43:31 2017 +0100

res/i18n/x2goclient_sv.ts: fixup Swedish translation file a little bit and 
add comments/requests for re-translations for the next time.
---
 debian/changelog  |2 ++
 res/i18n/x2goclient_sv.ts |   19 ---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d0e448..4c77d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -543,6 +543,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - deduplicate.sh: remove file, now obsolete and merged into macbuild.sh.
 - res/i18n/: refresh translation files again after copyright date changes.
 - res/i18n/x2goclient_fr.ts: fixup French translation file.
+- res/i18n/x2goclient_sv.ts: fixup Swedish translation file a little bit
+  and add comments/requests for re-translations for the next time.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts
index e260fa4..0133b9a 100644
--- a/res/i18n/x2goclient_sv.ts
+++ b/res/i18n/x2goclient_sv.ts
@@ -940,7 +940,7 @@ Några vanliga installationssökvägar är:
 
 
 Sets the remote X2Go Agents DPI value to 
dpi. Default: same as local display.
-Sätter DPI-värde för X2Gos fjärragent till 
dpi. Standardinställning: samma som lokal bildskärm. 
+Sätter DPI-värde för X2Gos fjärragent till 
dpi. Standardinställning: samma som lokal bildskärm.
 
 
 
@@ -980,7 +980,8 @@ Några vanliga installationssökvägar är:
 
 
 Automatically launches the application(s) app, 
app2, ... on session start in Published Applications mode.
-Automatisk start av applikation(er) app, 
app2, ... vid sessionsstart.
+Please make sure to include the information that 
applications are started in Published Application mode as described in the 
original string to not confuse the user, as Single Application and Published 
Applications modes behave differently.
+Automatisk start av applikation(er) 
app, app2, ... vid sessionsstart.
 
 
 
@@ -1015,7 +1016,8 @@ Några vanliga installationssökvägar är:
 
 
 Enables the use of the default SSH key or SSH agent for 
authentication against an SSH session broker. The clients behavior is 
undefined if this flag is used for non-SSH session brokers.
-Aktiverar användning av standard SSH-nyckel för 
autentisering mot SSH-broker. Klientens beteende är odefinierat om denna flagga 
används för icke-SSH-broker.
+Missing the bit about SSH agent 
authentication.
+Aktiverar användning av standard 
SSH-nyckel för autentisering mot SSH-broker. Klientens beteende är odefinierat 
om denna flagga används för icke-SSH-broker.
 
 
 
@@ -2014,7 +2016,8 @@ Data som ej sparats kommer att förloras.
 
 
 Unable to find the sftp-server binary. Neither bundled, nor 
found in $PATH nor additional directories.
-Kunde ej hitta binär för sftp-server.
+Missing the second sentence.
+Kunde ej hitta binär för 
sftp-server.
 
 
 
@@ -2055,7 +2058,7 @@ Om sftp-server finns installerat på ditt system, var 
vänlig rapportera felet (
 
 
 Unable to create SSH key base directory 
%1.
-Kunde ej skapa katalog %1.för 
SSH-nyckel.
+Kunde ej skapa katalog %1 för 
SSH-nyckel.
 
 
 
@@ -2095,7 +2098,8 @@ Om sftp-server finns installerat på ditt system, var 
vänlig rapportera felet (
 
 
 Unable to open newly generated %1 public host key 
file.
-Kunde ej öppna nyligen genererad publik nyckelfil 
%1.
+%1 in this context will be replaced by the public host 
key *type*, e.g. "RSA", "DSA", "ECDSA" etc. You probably don't want to put %1 
at the end of the sentence here (unless Swedish does that, of 
course.)
+Kunde ej öppna nyligen genererad publik 
nyckelfil %1.
 
 
 
@@ -3624,7 +3628,8 @@ Exempel:
 
 
 Unable to find the PulseAudio binary. Neither bundled, nor 
found in $PATH nor additional directories.
-Kunde ej hitta binär för PulseAudio.
+Please also include the second sentence, might be 
interesting for users to know where we search and that it's not just 
$PATH.
+Kunde ej hitta binär för 
PulseAudio.
 
 
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: macbuild.sh: switch to bundling PulseAudio 10.0 since it's now available in MacPorts.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 2120fa94f383e24beb479621e13198bc80e588a4
Author: Mihai Moldovan 
Date:   Mon Jan 23 10:09:12 2017 +0100

macbuild.sh: switch to bundling PulseAudio 10.0 since it's now available in 
MacPorts.
---
 debian/changelog |2 ++
 macbuild.sh  |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c77d47..d9d2a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -545,6 +545,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - res/i18n/x2goclient_fr.ts: fixup French translation file.
 - res/i18n/x2goclient_sv.ts: fixup Swedish translation file a little bit
   and add comments/requests for re-translations for the next time.
+- macbuild.sh: switch to bundling PulseAudio 10.0 since it's now available
+  in MacPorts.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/macbuild.sh b/macbuild.sh
index 69e342d..e59db97 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -178,13 +178,13 @@ NXPROXY="nxproxy"
 PULSEAUDIO_BINARIES=( "pulseaudio" "esdcompat" "pacat" "pacmd"  "pactl"
   "pamon"  "paplay""parec" "parecord"   
"pasuspender" )
 PULSEAUDIO_LIBRARIES=( "libpulse-simple.0.dylib"
-   "pulse-9.0"
+   "pulse-10.0"
"pulseaudio" )
 RESOURCE_FILES=( "audio/startup.wav" )
 
 typeset -a special_files_regex
-special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]\.[0-9]\.dylib"
-   "pulseaudio/libpulsecore-[0-9]\.[0-9]\.dylib"   )
+special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]+\.[0-9]+\.dylib"
+   "pulseaudio/libpulsecore-[0-9]+\.[0-9]+\.dylib"   )
 
 typeset -r dependency_base_format='@executable_path/../Frameworks/'
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch master updated (1ccbe81 -> 2120fa9)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  1ccbe81   res/i18n/x2goclient_sv.ts: fixup Swedish translation file 
a little bit and add comments/requests for re-translations for the next time.
   new  2120fa9   macbuild.sh: switch to bundling PulseAudio 10.0 since 
it's now available in MacPorts.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |2 ++
 macbuild.sh  |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch master updated (2120fa9 -> b0943be)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  2120fa9   macbuild.sh: switch to bundling PulseAudio 10.0 since 
it's now available in MacPorts.
   new  253b2ab   src/x2goclient.cpp: no need to put new_argv_c_str 
std::vector onto the heap.
   new  b0943be   src/x2goclient.cpp: use $PATH-exploration when 
re-executing x2goclient in UNIX cleanup helper mode. Fixes: #1139.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |4 
 src/x2goclient.cpp |8 
 2 files changed, 8 insertions(+), 4 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/02: src/x2goclient.cpp: use $PATH-exploration when re-executing x2goclient in UNIX cleanup helper mode. Fixes: #1139.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit b0943be07d7a3eba3f403fd488f5044a6637862c
Author: Mihai Moldovan 
Date:   Mon Jan 23 16:51:02 2017 +0100

src/x2goclient.cpp: use $PATH-exploration when re-executing x2goclient in 
UNIX cleanup helper mode. Fixes: #1139.
---
 debian/changelog   |2 ++
 src/x2goclient.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d608793..35c0c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -549,6 +549,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   in MacPorts.
 - src/x2goclient.cpp: no need to put new_argv_c_str std::vector onto the
   heap. Keep it on the stack.
+- src/x2goclient.cpp: use $PATH-exploration when re-executing x2goclient
+  in UNIX cleanup helper mode. Fixes: #1139.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index b25d0ce..9879142 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -57,7 +57,7 @@ int fork_helper (int argc, char **argv) {
 /* Add null pointer as last element. */
 new_argv_c_str.push_back (0);
 
-if (0 != execv (new_argv_c_str.front (), &(new_argv_c_str.front ( {
+if (0 != execvp (new_argv_c_str.front (), &(new_argv_c_str.front ( {
   const int saved_errno = errno;
   std::cerr << "Failed to re-execute process as UNIX cleanup helper tool: 
" << std::strerror (saved_errno) << "\n"
 << "Terminating and killing parent." << "\n"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: src/x2goclient.cpp: no need to put new_argv_c_str std::vector onto the heap.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 253b2abae6148033effcd50c21e18a1df532c911
Author: Mihai Moldovan 
Date:   Mon Jan 23 16:49:14 2017 +0100

src/x2goclient.cpp: no need to put new_argv_c_str std::vector onto the heap.

Keep it on the stack.
---
 debian/changelog   |2 ++
 src/x2goclient.cpp |8 
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9d2a5d..d608793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -547,6 +547,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   and add comments/requests for re-translations for the next time.
 - macbuild.sh: switch to bundling PulseAudio 10.0 since it's now available
   in MacPorts.
+- src/x2goclient.cpp: no need to put new_argv_c_str std::vector onto the
+  heap. Keep it on the stack.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index 426a204..b25d0ce 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -48,16 +48,16 @@ int fork_helper (int argc, char **argv) {
 new_argv.push_back (std::string (argv[0]));
 new_argv.push_back ("--unixhelper");
 
-std::vector *new_argv_c_str = new (std::vector) ();
+std::vector new_argv_c_str;
 for (std::vector::iterator it = new_argv.begin (); it != 
new_argv.end (); ++it) {
   const char *elem = (*it).c_str ();
-  new_argv_c_str->push_back (strndup (elem, std::strlen (elem)));
+  new_argv_c_str.push_back (strndup (elem, std::strlen (elem)));
 }
 
 /* Add null pointer as last element. */
-new_argv_c_str->push_back (0);
+new_argv_c_str.push_back (0);
 
-if (0 != execv (new_argv_c_str->front (), &(new_argv_c_str->front ( {
+if (0 != execv (new_argv_c_str.front (), &(new_argv_c_str.front ( {
   const int saved_errno = errno;
   std::cerr << "Failed to re-execute process as UNIX cleanup helper tool: 
" << std::strerror (saved_errno) << "\n"
 << "Terminating and killing parent." << "\n"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade created (now 81d9085)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

at  81d9085   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.

This branch includes the following new commits:

   new  138a1ac   src/sshmasterconnection.cpp: use 
ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh 
versions.
   new  81d9085   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/02: src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh versions.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 138a1ac4f01a2348f9f0ab3b8a7ca6f541b819d9
Author: Mihai Moldovan 
Date:   Sat Jan 28 16:04:28 2017 +0100

src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of 
ssh_forward_listen () for newer libssh versions.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |   35 ---
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad063a..8824554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -557,6 +557,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time (for instance when running x2goclient --help.)
 - src/onmainwindow.cpp: correctly guard the new lines from the previous
   commit. Fixes compile issues on Linux and other systems.
+- src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
+  of ssh_forward_listen () for newer libssh versions.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 84e0970..b3f9aa3 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -279,22 +279,35 @@ void SshMasterConnection::addReverseTunnelConnections()
 if(!reverseTunnelRequest[i].listen)
 {
 reverseTunnelRequest[i].listen=true;
-int rc=ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
-if(rc==SSH_OK)
-{
-emit reverseTunnelOk(reverseTunnelRequest[i].creator);
+
+int rc = SSH_AGAIN;
+
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
+/* Non-blocking mode may return SSH_AGAIN, so try again if 
neceassary. */
+while (SSH_AGAIN == rc) {
+rc = ssh_channel_listen_forward(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#else
+rc = ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#endif
+
+if(rc==SSH_OK)
+{
+emit reverseTunnelOk(reverseTunnelRequest[i].creator);
 #ifdef DEBUG
-x2goDebug<<"Listening for TCP/IP connections on 
"<= SSH_VERSION_INT (0, 7, 0)
 }
+#endif
 }
 }
 reverseTunnelRequestMutex.unlock();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 02/02: src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () and its hash via ssh_get_publickey_hash () instead of us

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 81d90855f1f182c713b4500fe158f140c11caf19
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:08:43 2017 +0100

src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public 
key via ssh_get_server_publickey () and its hash via ssh_get_publickey_hash () 
instead of using the deprecated ssh_get_pubkey_hash () function.

Additionally, replace free () with the more appropriate
ssh_string_free_char () function after using ssh_get_hexa ().

This will break on very old systems with a hopelessly outdated libssh
version, but we do not care about these systems in the first place.
---
 debian/changelog|8 
 src/sshmasterconnection.cpp |   32 ++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8824554..5e6557e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -559,6 +559,14 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   commit. Fixes compile issues on Linux and other systems.
 - src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
   of ssh_forward_listen () for newer libssh versions.
+- src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public
+  key via ssh_get_server_publickey () and its hash via
+  ssh_get_publickey_hash () instead of using the deprecated
+  ssh_get_pubkey_hash () function. Additionally, replace free () with the
+  more appropriate ssh_string_free_char () function after using
+  ssh_get_hexa (). This will break on very old systems with a hopelessly
+  outdated libssh version, but we do not care about these systems in the
+  first place.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index b3f9aa3..e5da19c 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -20,6 +20,7 @@
 #include "sshmasterconnection.h"
 #include 
 #include 
+#include 
 #include "sshprocess.h"
 
 
@@ -812,13 +813,33 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
 x2goDebug<<"cserverAuth";
 #endif
 
-int state, hlen;
+int state = SSH_SERVER_ERROR;
+size_t hlen = 0;
 unsigned char *hash = NULL;
-char *hexa;
+char *hexa = NULL;
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+ssh_key srv_pubkey = { };
+int rc = SSH_ERROR;
+#endif
 
 state = ssh_is_server_known ( my_ssh_session );
-hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
 
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+rc = ssh_get_server_publickey (session, _pubkey);
+
+if (SSH_OK != rc) {
+return (SSH_SERVER_ERROR);
+}
+
+rc = ssh_get_publickey_hash (srv_pubkey, SSH_PUBLICKEY_HASH_SHA1, , 
);
+ssh_key_free (srv_pubkey);
+
+if (0 != rc) {
+return (SSH_SERVER_ERROR);
+}
+#else
+hlen = ssh_get_pubkey_hash ( my_ssh_session,  );
+#endif
 
 if ( hlen < 0 )
 return SSH_SERVER_ERROR;
@@ -827,7 +848,6 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
 x2goDebug<<"state: "<

[X2Go-Commits] [x2goclient] 01/01: src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 001341c27127108303c0c1a29920cf830aa0ba15
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:36:03 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_new () function 
with ssh_channel_new ().

Might break on ancient systems, but we don't care.

Also, add error handling in case ssh_channel_new () failed...
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 77805e7..770f2ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -569,6 +569,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   first place.
 - src/sshmasterconnection.cpp: replace string_free () with its successor
   ssh_string_free (). Will break on ancient systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_new () function
+  with ssh_channel_new (). Might break on ancient systems, but we don't
+  care. Also, add error handling in case ssh_channel_new () failed...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index d584ceb..1b10511 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1549,7 +1549,19 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Creating new channel."<

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (81d9085 -> 694b894)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  from  81d9085   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.
   new  694b894   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (694b894 -> 001341c)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  from  694b894   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
   new  001341c   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 694b89449271a9c62d0554d124659045fd819a91
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:15:38 2017 +0100

src/sshmasterconnection.cpp: replace string_free () with its successor 
ssh_string_free ().

Will break on ancient systems, but we don't care.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5e6557e..77805e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -567,6 +567,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   ssh_get_hexa (). This will break on very old systems with a hopelessly
   outdated libssh version, but we do not care about these systems in the
   first place.
+- src/sshmasterconnection.cpp: replace string_free () with its successor
+  ssh_string_free (). Will break on ancient systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index e5da19c..d584ceb 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1186,7 +1186,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
 privatekey_free(prkey);
-string_free(pubkeyStr);
+ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
 x2goDebug<<"Authenticating with key: "<

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (e249b8c -> 1c2c520)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  from  e249b8c   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
   new  1c2c520   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   31 ---
 2 files changed, 19 insertions(+), 15 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/01: src/sshmasterconnection.cpp: use QString::arg () to insert function name and thus deduplicate error translation messages.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 1c2c5209fc9497c66207e1c43177a3e6781d1fa0
Author: Mihai Moldovan 
Date:   Sat Jan 28 18:34:46 2017 +0100

src/sshmasterconnection.cpp: use QString::arg () to insert function name 
and thus deduplicate error translation messages.

Also re-add the full stop sign and remove it when needed for x2goDebug.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   31 ---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9533da..82246cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -602,6 +602,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_free () function
   with ssh_channel_free (). Might break on ancient systems, but we don't
   care.
+- src/sshmasterconnection.cpp: use QString::arg () to insert function name
+  and thus deduplicate error translation messages. Also re-add the full
+  stop sign and remove it when needed for x2goDebug.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 84d8e53..13432a6 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1553,11 +1553,12 @@ void SshMasterConnection::channelLoop()
 
 if (!channel) {
 QString err = ssh_get_error (my_ssh_session);
-QString error_msg = tr ("ssh_channel_new failed");
-emit ioErr (channelConnections[i].creator, error_msg + 
".", err);
+/*: Argument in this context will be a function name. */
+QString error_msg = tr ("%1 failed.").arg 
("ssh_channel_new");
+emit ioErr (channelConnections[i].creator, error_msg, err);
 
 #ifdef DEBUG
-x2goDebug << errorMsg << ": " << err << endl;
+x2goDebug << errorMsg.left (errorMsg.size () - 1) << ": " 
<< err << endl;
 #endif
 
 continue;
@@ -1578,10 +1579,10 @@ void SshMasterConnection::channelLoop()
 channelConnections.at ( i 
).localPort ) != SSH_OK )
 {
 QString err=ssh_get_error ( my_ssh_session );
-QString errorMsg=tr ( "ssh_channel_open_forward 
failed" );
-emit ioErr ( channelConnections[i].creator, errorMsg + 
".", err );
+QString errorMsg=tr ( "%1 failed." ).arg 
("ssh_channel_open_forward");
+emit ioErr ( channelConnections[i].creator, errorMsg, 
err );
 #ifdef DEBUG
-x2goDebug<

[X2Go-Commits] [x2goclient] 04/15: src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit c8924ecaecfd893adc8d55bd4d82813053729973
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:36:03 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_new () function 
with ssh_channel_new ().

Might break on ancient systems, but we don't care.

Also, add error handling in case ssh_channel_new () failed...
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |   14 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2a4eea6..f1b9498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -569,6 +569,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   first place.
 - src/sshmasterconnection.cpp: replace string_free () with its successor
   ssh_string_free (). Will break on ancient systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_new () function
+  with ssh_channel_new (). Might break on ancient systems, but we don't
+  care. Also, add error handling in case ssh_channel_new () failed...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index d584ceb..1b10511 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1549,7 +1549,19 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
 x2goDebug<<"Creating new channel."<

[X2Go-Commits] [x2goclient] 01/15: src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh versions. Fixes: #870.

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 64abe5ab1d03ab40daa0a60377f6e95b8c86c79e
Author: Mihai Moldovan 
Date:   Sat Jan 28 16:04:28 2017 +0100

src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of 
ssh_forward_listen () for newer libssh versions. Fixes: #870.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |   35 ---
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad063a..438f75f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -557,6 +557,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   time (for instance when running x2goclient --help.)
 - src/onmainwindow.cpp: correctly guard the new lines from the previous
   commit. Fixes compile issues on Linux and other systems.
+- src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead
+  of ssh_forward_listen () for newer libssh versions. Fixes: #870.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 84e0970..b3f9aa3 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -279,22 +279,35 @@ void SshMasterConnection::addReverseTunnelConnections()
 if(!reverseTunnelRequest[i].listen)
 {
 reverseTunnelRequest[i].listen=true;
-int rc=ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
-if(rc==SSH_OK)
-{
-emit reverseTunnelOk(reverseTunnelRequest[i].creator);
+
+int rc = SSH_AGAIN;
+
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
+/* Non-blocking mode may return SSH_AGAIN, so try again if 
neceassary. */
+while (SSH_AGAIN == rc) {
+rc = ssh_channel_listen_forward(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#else
+rc = ssh_forward_listen(my_ssh_session, NULL, 
reverseTunnelRequest[i].forwardPort, NULL);
+#endif
+
+if(rc==SSH_OK)
+{
+emit reverseTunnelOk(reverseTunnelRequest[i].creator);
 #ifdef DEBUG
-x2goDebug<<"Listening for TCP/IP connections on 
"<= SSH_VERSION_INT (0, 7, 0)
 }
+#endif
 }
 }
 reverseTunnelRequestMutex.unlock();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] branch feature/libssh-api-upgrade updated (1c2c520 -> 2b7f608)

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch feature/libssh-api-upgrade
in repository x2goclient.

  discards  1c2c520   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.
  discards  e249b8c   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
  discards  6a653e5   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
  discards  f04dc49   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
  discards  8a7dfa1   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
  discards  4059b04   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
  discards  1670337   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
  discards  2267bf7   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
  discards  eda953c   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
  discards  f118498   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
  discards  f73adcd   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
  discards  001341c   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
  discards  694b894   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
  discards  81d9085   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.
  discards  138a1ac   src/sshmasterconnection.cpp: use 
ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh 
versions.
   new  64abe5a   src/sshmasterconnection.cpp: use 
ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh 
versions. Fixes: #870.
   new  0aa484b   src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, 
get the public key via ssh_get_server_publickey () and its hash via 
ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash 
() function.
   new  8ac36d5   src/sshmasterconnection.cpp: replace string_free () with 
its successor ssh_string_free ().
   new  c8924ec   src/sshmasterconnection.cpp: replace deprecated 
channel_new () function with ssh_channel_new ().
   new  6a9f84b   src/sshmasterconnection.cpp: replace deprecated 
channel_open_forward () function with ssh_channel_open_forward ().
   new  78bcfce   src/sshmasterconnection.cpp: replace deprecated 
channel_open_session () function with ssh_channel_open_session ().
   new  84d6b42   src/sshmasterconnection.cpp: replace deprecated 
channel_request_exec () function with ssh_channel_request_exec ().
   new  a07327f   src/sshmasterconnection.cpp: replace deprecated 
channel_poll () function with ssh_channel_poll ().
   new  b3c2f85   src/sshmasterconnection.cpp: replace deprecated 
channel_read () function with ssh_channel_read ().
   new  775718f   src/sshmasterconnection.cpp: replace deprecated 
channel_is_eof () function with ssh_channel_is_eof ().
   new  e210fa3   src/sshmasterconnection.cpp: replace deprecated 
channel_write () function with ssh_channel_write ().
   new  96ad7a6   src/sshmasterconnection.cpp: replace deprecated 
channel_send_eof () function with ssh_channel_send_eof ().
   new  179dd39   src/sshmasterconnection.cpp: replace deprecated 
channel_close () function with ssh_channel_close ().
   new  7954adb   src/sshmasterconnection.cpp: replace deprecated 
channel_free () function with ssh_channel_free ().
   new  2b7f608   src/sshmasterconnection.cpp: use QString::arg () to 
insert function name and thus deduplicate error translation messages.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (1c2c520)
\
 N -- N -- N   refs/heads/feature/libssh-api-upgrade (2b7f608)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 15 

[X2Go-Commits] [x2goclient] 07/15: src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 84d6b42b3897d873768a5892c7e91cdce015552c
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:52:29 2017 +0100

src/sshmasterconnection.cpp: replace deprecated channel_request_exec () 
function with ssh_channel_request_exec ().

Might break on ancient systems, but we don't care.
---
 debian/changelog|3 +++
 src/sshmasterconnection.cpp |6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f02bd4d..e9770e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -578,6 +578,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
 - src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
   function with ssh_channel_open_session (). Might break on ancient
   systems, but we don't care.
+- src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
+  function with ssh_channel_request_exec (). Might break on ancient
+  systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 5bb68e7..1ea8de6 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1605,11 +1605,11 @@ void SshMasterConnection::channelLoop()
 x2goDebug<

[X2Go-Commits] [x2goclient] 03/15: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

[git-admin]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 8ac36d5f48200ab8675c86d4b67f9735fcdff955
Author: Mihai Moldovan 
Date:   Sat Jan 28 17:15:38 2017 +0100

src/sshmasterconnection.cpp: replace string_free () with its successor 
ssh_string_free ().

Will break on ancient systems, but we don't care.
---
 debian/changelog|2 ++
 src/sshmasterconnection.cpp |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b00ad18..2a4eea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -567,6 +567,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
   ssh_get_hexa (). This will break on very old systems with a hopelessly
   outdated libssh version, but we do not care about these systems in the
   first place.
+- src/sshmasterconnection.cpp: replace string_free () with its successor
+  ssh_string_free (). Will break on ancient systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index e5da19c..d584ceb 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1186,7 +1186,7 @@ bool SshMasterConnection::userAuthWithKey()
 
 int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
 privatekey_free(prkey);
-string_free(pubkeyStr);
+ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
 x2goDebug<<"Authenticating with key: "<