andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os: Remove unconfigurable DEFAULT_ACCESS_CONTROL macro

Browse Source
This commit is contained in:
Adam Jackson 2019-10-16 14:28:33 -04:00 committed by Adam Jackson
parent 56ea4c769c
commit 66eb933ec9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/site.h
View File

@ -81,8 +81,5 @@ SOFTWARE.
#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) #define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
#ifndef DEFAULT_ACCESS_CONTROL
#define DEFAULT_ACCESS_CONTROL TRUE
#endif
#endif /* SITE_H */ #endif /* SITE_H */

4
os/access.c
View File

@ -228,7 +228,7 @@ typedef struct _host {
#define FreeHost(h) free(h) #define FreeHost(h) free(h)
static HOST *selfhosts = NULL; static HOST *selfhosts = NULL;
static HOST *validhosts = NULL; static HOST *validhosts = NULL;
static int AccessEnabled = DEFAULT_ACCESS_CONTROL; static int AccessEnabled = TRUE;
static int LocalHostEnabled = FALSE; static int LocalHostEnabled = FALSE;
static int LocalHostRequested = FALSE; static int LocalHostRequested = FALSE;
static int UsingXdmcp = FALSE; static int UsingXdmcp = FALSE;
@ -951,7 +951,7 @@ ResetHosts(const char *display)
int len; int len;
siTypesInitialize(); siTypesInitialize();
AccessEnabled = defeatAccessControl ? FALSE : DEFAULT_ACCESS_CONTROL; AccessEnabled = !defeatAccessControl;
LocalHostEnabled = FALSE; LocalHostEnabled = FALSE;
while ((host = validhosts) != 0) { while ((host = validhosts) != 0) {
validhosts = host->next; validhosts = host->next;