x2godesktopsharing.git - master (branch) updated: 3.0.1.2-8-g4b8c2ab - x2go-commits

27 Sep 2011

The branch, master has been updated
       via  4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 (commit)
      from  91e0971284d686e42f444e312cf3220ea22ea6f9 (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 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Sep 27 09:40:43 2011 +0200

    Differentiate between local and remote user, fixes display of wrong user name for remote user. Depend on x2goserver (>=3.0.99.6).

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

Summary of changes:
 debian/changelog |   14 +++++++++-----
 debian/control   |    2 +-
 main.cpp         |    2 +-
 sharetray.cpp    |   10 ++++++----
 4 files changed, 17 insertions(+), 11 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index b0d3854..5967ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low
 
-  * Fix incomplete DENY statement in main.cpp.
-  * System group for x2godesktopsharing change from x2gousers -> 
-    x2godesktopsharing.
-  * Make sure postinst script does not fail when checking for existence
-    of group x2godesktopsharing.
+  New upstream version (3.0.1.3):
+    - Fix incomplete DENY statement in main.cpp.
+    - System group for x2godesktopsharing change from x2gousers -> 
+      x2godesktopsharing.
+    - Make sure postinst script does not fail when checking for existence
+      of group x2godesktopsharing.
+    - Differentiate between local and remote user, fixes display of wrong
+      user name for remote user.
+  Depend on x2goserver (>=3.0.99.6).
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 13 Jun 2011 20:39:33 +0200
 
diff --git a/debian/control b/debian/control
index 028fb3e..94119f0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- x2goserver (>= 3.0.99),
+ x2goserver (>= 3.0.99.6-0~),
  libqt4-gui,
 Recommends:
 Description: share X2go desktops with other users (via shadow sessions)
diff --git a/main.cpp b/main.cpp
index 22dad15..7917c66 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,7 +33,7 @@ using namespace std;
 void  client ( const QStringList & cmd )
 {
 
-    if ( cmd.size() !=10 )
+    if ( cmd.size() !=11 )
     {
         cerr<<"wrong parameters"<<endl;
         cout<<"DENY";
diff --git a/sharetray.cpp b/sharetray.cpp
index 9f42997..ca0f3a8 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -244,7 +244,7 @@ QString ShareTray::getSocketAnswer ( QString message )
 {
     qDebug() <<"message: "<<message;
     QStringList lst=message.split ( ' ' );
-    if ( lst.size() !=10 )
+    if ( lst.size() !=11 )
     {
         qDebug() <<"wrong parameters";
         return "DENY";
@@ -257,6 +257,7 @@ QString ShareTray::getSocketAnswer ( QString message )
     }
     QString client=lst[0];
     QString user=params[1];
+    QString remote_user=params[11];
     if ( getAccess ( user, client ) ==QMessageBox::Yes )
     {
         trayMessage ( tr ( "Access granted" ),QString (
@@ -265,6 +266,7 @@ QString ShareTray::getSocketAnswer ( QString message )
                           user ).arg ( client ) );
         //start agent
         QProcess proc ( this );
+        lst.removeAt ( 11 );;
         lst.removeAt ( 0 );;
         proc.start ( "x2gostartagent",lst );
         if ( !proc.waitForFinished ( 5000 ) )
@@ -282,20 +284,20 @@ QString ShareTray::getSocketAnswer ( QString message )
             qDebug() <<"agent pid: "<<pid;
             AccessAction *act=new AccessAction (
                 pid,user,client,
-                QString ( tr ( "Disconnect %1(%2)" ) ).arg ( user ).arg ( client ),
+                QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ),
                 this );
             menu->insertAction ( menu->actions() [0],act );
             connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this,
                       SLOT ( slotCloseConnection ( AccessAction* ) ) );
             trayMessage ( tr ( "Remote connection" ),
                           QString (
-                              tr ( "%1(%2) connected" ) ).arg ( user ).arg ( client ) );
+                              tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) );
             setTrayIcon();
             return output;
         }
     }
     trayMessage ( tr ( "Access denied" ),QString (
-                      tr ( "%1(%2): access denied" ) ).arg ( params[1] ).arg ( client ) );
+                      tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) );
     return "DENY";
 }
 


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2go)

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 "x2godesktopsharing.git" (Desktop Sharing for X2go).

    