Sfoglia il codice sorgente

Merge pull request #1463 from TigerVNC/accessRightsFixes

Minor fixes/future-proofing for SConnection::accessCheck() and 'accessRights'
tags/v1.12.90
Samuel Mannehed 2 anni fa
parent
commit
6e762cd217
Nessun account collegato all'indirizzo email del committer
1 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 4
    1
      common/rfb/SConnection.cxx

+ 4
- 1
common/rfb/SConnection.cxx Vedi File

@@ -23,6 +23,7 @@

#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <rfb/Exception.h>
#include <rfb/Security.h>
#include <rfb/clipboardTypes.h>
@@ -59,7 +60,7 @@ SConnection::SConnection()
is(0), os(0), reader_(0), writer_(0), ssecurity(0),
authFailureTimer(this, &SConnection::handleAuthFailureTimeout),
state_(RFBSTATE_UNINITIALISED), preferredEncoding(encodingRaw),
clientClipboard(NULL), hasLocalClipboard(false),
accessRights(0x0000), clientClipboard(NULL), hasLocalClipboard(false),
unsolicitedClipboardAttempt(false)
{
defaultMajorVersion = 3;
@@ -346,6 +347,8 @@ void SConnection::setAccessRights(AccessRights ar)

bool SConnection::accessCheck(AccessRights ar) const
{
assert(state_ >= RFBSTATE_QUERYING);

return (accessRights & ar) == ar;
}


Loading…
Annulla
Salva