summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrunge <runge>2007-05-17 00:01:03 +0000
committerrunge <runge>2007-05-17 00:01:03 +0000
commita549c3aaffd8654c24221f4806f08bb1200583a6 (patch)
tree5826da0f6ea035cc82479907c9002d71cfe23c04
parenta270771286728d5d148829da0a2235e2c35554f0 (diff)
downloadlibtdevnc-a549c3aaffd8654c24221f4806f08bb1200583a6.tar.gz
libtdevnc-a549c3aaffd8654c24221f4806f08bb1200583a6.zip
In rfbSendFileTransferChunk() check permitFileTransfer 1st to avoid false alarms.
-rw-r--r--libvncserver/rfbserver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index 53e8cfb..aec12cd 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -1310,10 +1310,11 @@ rfbBool rfbSendFileTransferChunk(rfbClientPtr cl)
/*
* Don't close the client if we get into this one because
* it is called from many places to service file transfers.
+ * Note that permitFileTransfer is checked first.
*/
- if ((cl->screen->getFileTransferPermission != NULL
- && cl->screen->getFileTransferPermission(cl) != TRUE)
- || cl->screen->permitFileTransfer != TRUE) {
+ if (cl->screen->permitFileTransfer != TRUE ||
+ (cl->screen->getFileTransferPermission != NULL
+ && cl->screen->getFileTransferPermission(cl) != TRUE)) {
return TRUE;
}