Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2goclient.git - master (branch) updated: 4.0.0.0-8-g88dc7a1
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Wednesday 30th January 2013 13:43:33 UTC (over 3 years ago)
The branch, master has been updated
       via  88dc7a188651c07d52ede7b8ff6b2dd675a4ff0f (commit)
       via  d767876fde35b86ddb333fc3ad8ba2eed3c1dbcc (commit)
      from  bae30fd56eb3d3eaf36c8b039dd309e6445fb593 (commit)

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

- Log -----------------------------------------------------------------
commit 88dc7a188651c07d52ede7b8ff6b2dd675a4ff0f
Author: Oleksandr Shneyder

Date:   Wed Jan 30 14:43:21 2013 +0100

    support for session key "usebrokerpassforproxy" - use broker pass for
authentication on proxy

commit d767876fde35b86ddb333fc3ad8ba2eed3c1dbcc
Author: Oleksandr Shneyder

Date:   Wed Jan 30 14:22:29 2013 +0100

    Set autologin as false by default. Quote session ID in SSH broker code

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog     |    3 +++
 httpbrokerclient.cpp |    2 +-
 onmainwindow.cpp     |   17 +++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2cc467b..f0ae9a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low
   [ Oleksandr Shneyder ]
   * New upstream version (4.0.1.0):
     - Fix support for RSA Keys in X2Go Broker code.
+    - Set autologin as false by default. Quote session ID in SSH broker
code
+    - support for session key "usebrokerpassforproxy" - use broker pass
for
+      authentication on proxy
 
  -- Mike Gabriel
  Sun, 30
Dec 2012 15:41:04 +0100
 
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index fe6d89f..3093a48 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -270,7 +270,7 @@ void HttpBrokerClient::selectUserSession(const QString&
session)
     }
     else
     {
-        sshConnection->executeCommand ( config->sshBrokerBin+" --user "+
brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid
"+session,
+        sshConnection->executeCommand ( config->sshBrokerBin+" --user "+
brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid
\\\""+session+"\\\"",
                                         this,SLOT (
slotSelectSession(bool,QString,int)));
     }
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index db72c4a..24cdb2a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -103,6 +103,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent )
:QMainWindow ( parent )
 
     appSeparator=0;
     config.brokerNoAuth=false;
+    config.brokerAutologin=false;
+    cmdAutologin=false;
+
 
 
 #ifdef Q_OS_WIN
@@ -3337,8 +3340,18 @@ bool ONMainWindow::startSession ( const QString& sid
)
         if(useproxy && !proxyAutologin && proxyKey.length()<=0)
         {
             bool ok;
-           
proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport),
-                                                tr("Enter password for SSH
proxy"),QLineEdit::Password,QString::null, &ok);
+            bool useBrokerPassForProxy=false;
+            if(brokerMode)
+            {
+                useBrokerPassForProxy=(st->setting()->value (
+                                           sid+"/usebrokerpassforproxy",
false
+                                       ).toBool() );
+            }
+            if(useBrokerPassForProxy)
+                proxypassword=config.brokerPass;
+            else
+               
proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport),
+                                                    tr("Enter password for
SSH proxy"),QLineEdit::Password,QString::null, &ok);
         }
     }
 


hooks/post-receive
 
CD: 14ms