[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-69-gb693295

[X2Go dev team]

The branch, build-main has been updated
       via  b69329589121f2476a111622ec1cc34b12b5c112 (commit)
      from  d1bd66113a64e188083f32ef00164c82be3d6e6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    2 ++
 sshmasterconnection.cpp |    8 ++++++++
 2 files changed, 10 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index dad3af4..86465bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - c121b7e2d3d83abdc2d7a29637bc3294e38b2ec3 broke checking if remote
       command produce only stderr and not stdout. It made x2goclient crash
       if x2gostartagent send LIMIT error. Current commit fixes this issue. 
+    - SshMasterConnection should use current user name if no user name is
+      specified in session settings
 
   [ Heinrich Schuchardt ]
   * New upstream version (4.0.1.2):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 37673ea..fef5e5b 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -184,6 +184,14 @@ 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)
+    {
+#ifdef Q_OS_WIN
+        this->user=getenv("USERNAME");
+#else
+        this->user=getenv("USER");
+#endif
+    }
 #ifdef DEBUG
     if (kerberos)
     {


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).