diff --git a/include/site.h b/include/site.h index fd8c8ceff..06e2c7e00 100644 --- a/include/site.h +++ b/include/site.h @@ -81,8 +81,5 @@ SOFTWARE. #define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures -#ifndef DEFAULT_ACCESS_CONTROL -#define DEFAULT_ACCESS_CONTROL TRUE -#endif #endif /* SITE_H */ diff --git a/os/access.c b/os/access.c index 97246160c..ee432ebd5 100644 --- a/os/access.c +++ b/os/access.c @@ -228,7 +228,7 @@ typedef struct _host { #define FreeHost(h) free(h) static HOST *selfhosts = NULL; static HOST *validhosts = NULL; -static int AccessEnabled = DEFAULT_ACCESS_CONTROL; +static int AccessEnabled = TRUE; static int LocalHostEnabled = FALSE; static int LocalHostRequested = FALSE; static int UsingXdmcp = FALSE; @@ -951,7 +951,7 @@ ResetHosts(const char *display) int len; siTypesInitialize(); - AccessEnabled = defeatAccessControl ? FALSE : DEFAULT_ACCESS_CONTROL; + AccessEnabled = !defeatAccessControl; LocalHostEnabled = FALSE; while ((host = validhosts) != 0) { validhosts = host->next;