diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 07284f49e..cfa5fbbc8 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -187,12 +187,6 @@ xf86PrintBanner(void) "\tto make sure that you have the latest version.\n"); } -Bool -xf86PrivsElevated(void) -{ - return PrivsElevated(); -} - Bool xf86HasTTYs(void) { @@ -926,7 +920,7 @@ ddxProcessArgument(int argc, char **argv, int i) /* First the options that are not allowed with elevated privileges */ if (!strcmp(argv[i], "-modulepath")) { CHECK_FOR_REQUIRED_ARGUMENTS(1); - if (xf86PrivsElevated()) + if (PrivsElevated()) FatalError("\nInvalid argument -modulepath " "with elevated privileges\n"); xf86ModulePath = argv[i + 1]; @@ -935,7 +929,7 @@ ddxProcessArgument(int argc, char **argv, int i) } if (!strcmp(argv[i], "-logfile")) { CHECK_FOR_REQUIRED_ARGUMENTS(1); - if (xf86PrivsElevated()) + if (PrivsElevated()) FatalError("\nInvalid argument -logfile " "with elevated privileges\n"); xf86LogFile = argv[i + 1]; diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 662db054c..f6c70fa17 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -158,8 +158,6 @@ xf86SetLogVerbosity(int verb); extern _X_EXPORT Bool xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only); extern _X_EXPORT Bool -xf86PrivsElevated(void); -extern _X_EXPORT Bool xf86HasTTYs(void); #endif /* _NO_XF86_PROTOTYPES */ diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 111b3b4e4..4ea791a89 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -386,7 +386,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-masterfd")) { CHECK_FOR_REQUIRED_ARGUMENT(); - if (xf86PrivsElevated()) + if (PrivsElevated()) FatalError("\nCannot specify -masterfd when server is setuid/setgid\n"); if (sscanf(argv[++i], "%d", &xf86DRMMasterFd) != 1) { UseMsg();