[X2go-Commits] x2godesktopsharing.git - master (branch) updated: 3.0.1.2-3-g68851b5
X2go dev team
git-admin at x2go.org
Mon Jun 13 20:39:28 CEST 2011
The branch, master has been updated
via 68851b594c736924659ee40696317b8c0bc9c27d (commit)
from 308d4207bf44963ce7c31984531d175b238de42d (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 68851b594c736924659ee40696317b8c0bc9c27d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jun 13 20:40:04 2011 +0200
Fix incomplete DENY statement in main.cpp.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
main.cpp | 10 +++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c4bd217..b8c5bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low
+
+ * Fix incomplete DENY statement in main.cpp.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200
+
x2godesktopsharing (3.0.1.2-0~x2go1) unstable; urgency=low
* change of version numbering scheme
diff --git a/main.cpp b/main.cpp
index 636c43c..22dad15 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,14 +36,14 @@ void client ( const QStringList & cmd )
if ( cmd.size() !=10 )
{
cerr<<"wrong parameters"<<endl;
- cout<<"DEN";
+ cout<<"DENY";
return;
}
QStringList params=cmd[9].split ( "XSHAD" );
if ( params.size() !=3 )
{
cerr<<"wrong parameters"<<endl;
- cout<<"DEN";
+ cout<<"DENY";
return;
}
@@ -58,14 +58,14 @@ void client ( const QStringList & cmd )
if ( !sock.waitForConnected ( 3000 ) )
{
QString message="Unable to connect: " +socketName;
- cout<<"DEN";
+ cout<<"DENY";
cerr<<message.toAscii().data() <<endl;
return;
}
sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() );
if ( !sock.waitForReadyRead() )
{
- cout<<"DEN";
+ cout<<"DENY";
cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl;
return;;
}
@@ -73,7 +73,7 @@ void client ( const QStringList & cmd )
int read=sock.read ( buffer,255 );
if ( read<=0 )
{
- cout<<"DEN";
+ cout<<"DENY";
cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl;
return;
}
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).
More information about the x2go-commits
mailing list