The branch, master has been updated via e1c182ae6ae9f2c9f0cafd358cd36237132ab225 (commit) from f3e8850ff93d619ee8dff0251571193c760a0aea (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 e1c182ae6ae9f2c9f0cafd358cd36237132ab225 Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Date: Fri Nov 25 13:02:56 2011 +0100 Non-maintainer upload. * Non-maintainer upload. * LDAP: ssh port for every x2goserver can be specified in Server entry, parameter "l" ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ onmainwindow.cpp | 22 ++++++++++++++++++---- onmainwindow.h | 1 + onmainwindow_part3.cpp | 1 + 4 files changed, 27 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index faba982..3e253ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goclient (3.99.0.2-0~x2go1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * LDAP: ssh port for every x2goserver can be specified in Server entry, parameter "l" + + -- Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Fri, 25 Nov 2011 13:01:01 +0100 + x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/onmainwindow.cpp b/onmainwindow.cpp index ecafee0..b7f54cd 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1503,6 +1503,7 @@ void ONMainWindow::slotPassEnter() list<string> attr; attr.push_back ( "cn" ); attr.push_back ( "serialNumber" ); + attr.push_back ( "l" ); list<LDAPStringEntry> res; QString searchBase="ou=Servers,ou=ON,"+ldapDn; @@ -1541,11 +1542,17 @@ void ONMainWindow::slotPassEnter() serv server; server.name=LDAPSession::getStringAttrValues ( *it,"cn" ).front().c_str(); - if ( !isFirstServerSet ) + + QString sPort="22"; + list<string> sL=LDAPSession::getStringAttrValues ( + *it,"l" ); + if ( sL.size() >0 ) { - isFirstServerSet=true; - firstServer=server.name; + sPort=sL.front().c_str(); } + x2goDebug<<server.name<<": ssh port is "<<sPort; + + QString sFactor="1"; list<string> serialNumber=LDAPSession::getStringAttrValues ( *it,"serialNumber" ); @@ -1556,7 +1563,14 @@ void ONMainWindow::slotPassEnter() x2goDebug<<server.name<<": factor is "<<sFactor; server.factor=sFactor.toFloat(); server.sess=0; + server.sshPort=sPort; server.connOk=true; + if ( !isFirstServerSet ) + { + isFirstServerSet=true; + firstServer=server.name; + sshPort=server.sshPort; + } x2goServers.append ( server ); } if ( ld ) @@ -2538,7 +2552,7 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po { SshMasterConnection* con; - x2goDebug<<"start new ssh connection"<<endl; + x2goDebug<<"start new ssh connection to server:"<<host<<":"<<port<<endl; for ( int i=0;i<sshEnv.size();++i ) { #ifndef Q_OS_WIN diff --git a/onmainwindow.h b/onmainwindow.h index 0fe58f7..7d5a3e9 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -115,6 +115,7 @@ struct serv { return it.sess<it1.sess; } + QString sshPort; }; struct x2goSession diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index 8fc3122..d2d6747 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -824,6 +824,7 @@ void ONMainWindow::slotGetServers ( bool result, QString output, for ( int j=0;j<x2goServers.size();++j ) { QString host=x2goServers[j].name; + sshPort=x2goServers[j].sshPort; serverSshConnections<<startSshConnection ( host,sshPort,acceptRsa,user,passwd,true,true); } } 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).