From a549c3aaffd8654c24221f4806f08bb1200583a6 Mon Sep 17 00:00:00 2001 From: runge Date: Thu, 17 May 2007 00:01:03 +0000 Subject: In rfbSendFileTransferChunk() check permitFileTransfer 1st to avoid false alarms. --- libvncserver/rfbserver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libvncserver') 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; } -- cgit v1.2.1