frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: use the xf86CheckPrivs() helper for modulepath/logfile 

v2: Rebase against updated xf86CheckPrivs() helper.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2016-05-02 23:47:21 +01:00 committed by Adam Jackson
parent 0fdd475604
commit 032b1d79b7
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/common/xf86Init.c
View File

@ -1120,15 +1120,11 @@ ddxProcessArgument(int argc, char **argv, int i)
} }
/* First the options that are not allowed with elevated privileges */ /* First the options that are not allowed with elevated privileges */
if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) { if (!strcmp(argv[i], "-modulepath")) {
if (xf86PrivsElevated()) {
FatalError("The '%s' option cannot be used with "
"elevated privileges.\n", argv[i]);
}
else if (!strcmp(argv[i], "-modulepath")) {
char *mp; char *mp;
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]);
mp = strdup(argv[i + 1]); mp = strdup(argv[i + 1]);
if (!mp) if (!mp)
FatalError("Can't allocate memory for ModulePath\n"); FatalError("Can't allocate memory for ModulePath\n");
@ -1136,10 +1132,11 @@ ddxProcessArgument(int argc, char **argv, int i)
xf86ModPathFrom = X_CMDLINE; xf86ModPathFrom = X_CMDLINE;
return 2; return 2;
} }
else if (!strcmp(argv[i], "-logfile")) { if (!strcmp(argv[i], "-logfile")) {
char *lf; char *lf;
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]);
lf = strdup(argv[i + 1]); lf = strdup(argv[i + 1]);
if (!lf) if (!lf)
FatalError("Can't allocate memory for LogFile\n"); FatalError("Can't allocate memory for LogFile\n");
@ -1147,7 +1144,6 @@ ddxProcessArgument(int argc, char **argv, int i)
xf86LogFileFrom = X_CMDLINE; xf86LogFileFrom = X_CMDLINE;
return 2; return 2;
} }
}
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) { if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]); xf86CheckPrivs(argv[i], argv[i + 1]);