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

Re-enable validation of the screen section of xorg.conf 

This also fixes a problem where the server can't find the device section
when it is specified in the screen section.
This commit is contained in:
David Nusinow 2007-10-11 20:56:46 -04:00
parent ea2d4dc468
commit 28ef7f5941
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xfree86/parser/Screen.c
View File

@ -498,12 +498,6 @@ xf86validateScreen (XF86ConfigPtr p)
XF86ConfDevicePtr device; XF86ConfDevicePtr device;
XF86ConfAdaptorLinkPtr adaptor; XF86ConfAdaptorLinkPtr adaptor;
if (!screen)
{
xf86validationError ("At least one Screen section is required.");
return (FALSE);
}
while (screen) while (screen)
{ {
if (screen->scrn_obso_driver && !screen->scrn_identifier) if (screen->scrn_obso_driver && !screen->scrn_identifier)
@ -512,13 +506,7 @@ xf86validateScreen (XF86ConfigPtr p)
monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst); monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
if (screen->scrn_monitor_str) if (screen->scrn_monitor_str)
{ {
if (!monitor) if (monitor)
{
xf86validationError (UNDEFINED_MONITOR_MSG,
screen->scrn_monitor_str, screen->scrn_identifier);
return (FALSE);
}
else
{ {
screen->scrn_monitor = monitor; screen->scrn_monitor = monitor;
if (!xf86validateMonitor(p, screen)) if (!xf86validateMonitor(p, screen))

4
hw/xfree86/parser/read.c
View File

@ -82,8 +82,8 @@ xf86validateConfig (XF86ConfigPtr p)
{ {
/*if (!xf86validateDevice (p)) /*if (!xf86validateDevice (p))
return FALSE;*/ return FALSE;*/
/*if (!xf86validateScreen (p)) if (!xf86validateScreen (p))
return FALSE;*/ return FALSE;
if (!xf86validateInput (p)) if (!xf86validateInput (p))
return FALSE; return FALSE;
if (!xf86validateLayout (p)) if (!xf86validateLayout (p))