xfree86: replace all uses of xf86PrivsElevated with PrivsElevated
[... but leave it defined and exported, since we're ABI-frozen - ajax] Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Ben Crocker <bcrocker@redhat.com> Reviewed-by: Antoine Martin <antoine@nagafix.co.uk> Tested-by: Ben Crocker <bcrocker@redhat.com> restore abi
This commit is contained in:
parent
1b6910af12
commit
75a869a4e7
|
@ -2275,7 +2275,7 @@ xf86HandleConfigFile(Bool autoconfig)
|
|||
MessageType filefrom = X_DEFAULT;
|
||||
MessageType dirfrom = X_DEFAULT;
|
||||
|
||||
if (!xf86PrivsElevated()) {
|
||||
if (!PrivsElevated()) {
|
||||
filesearch = ALL_CONFIGPATH;
|
||||
dirsearch = ALL_CONFIGDIRPATH;
|
||||
}
|
||||
|
|
|
@ -853,7 +853,7 @@ OsVendorInit(void)
|
|||
|
||||
#ifdef O_NONBLOCK
|
||||
if (!beenHere) {
|
||||
if (xf86PrivsElevated()) {
|
||||
if (PrivsElevated()) {
|
||||
int status;
|
||||
|
||||
status = fcntl(fileno(stderr), F_GETFL, 0);
|
||||
|
@ -1002,7 +1002,7 @@ xf86PrintDefaultLibraryPath(void)
|
|||
static void
|
||||
xf86CheckPrivs(const char *option, const char *arg)
|
||||
{
|
||||
if (xf86PrivsElevated() && !xf86PathIsSafe(arg)) {
|
||||
if (PrivsElevated() && !xf86PathIsSafe(arg)) {
|
||||
FatalError("\nInvalid argument for %s - \"%s\"\n"
|
||||
"\tWith elevated privileges %s must specify a relative path\n"
|
||||
"\twithout any \"..\" elements.\n\n", option, arg, option);
|
||||
|
@ -1299,7 +1299,7 @@ ddxUseMsg(void)
|
|||
ErrorF("\n");
|
||||
ErrorF("\n");
|
||||
ErrorF("Device Dependent Usage\n");
|
||||
if (!xf86PrivsElevated()) {
|
||||
if (!PrivsElevated()) {
|
||||
ErrorF("-modulepath paths specify the module search path\n");
|
||||
ErrorF("-logfile file specify a log file name\n");
|
||||
ErrorF("-configure probe for devices and write an "
|
||||
|
|
Loading…
Reference in New Issue