OpenBSD local modifications:

- privilege separation
- some snprintf/strlc{at,py} conversions
- support for more architectures
- signal handler fixes
- default mouse wheel support in config tools
- sunmouse protocol

1 files changed, 6 insertions, 1 deletions

diff --git a/xserver/hw/xfree86/common/xf86Config.c b/xserver/hw/xfree86/common/xf86Config.c
index f1055928e..c050def4e 100644
--- a/xserver/hw/xfree86/common/xf86Config.c
+++ b/xserver/hw/xfree86/common/xf86Config.c
@@ -1220,7 +1220,11 @@ configInputKbd(IDevPtr inputp)
 			 " the \"wskbd\" keyboard protocol");
 	 return FALSE;
      }
+#ifndef X_PRIVSEP
      xf86Info.kbdFd = open(s, O_RDWR | O_NONBLOCK | O_EXCL);
+#else
+     xf86Info.kbdFd = priv_open_device(s);
+#endif
      if (xf86Info.kbdFd == -1) {
        xf86ConfigError("cannot open \"%s\"", s);
        xfree(s);
@@ -1264,7 +1268,8 @@ configInputKbd(IDevPtr inputp)
 	     close(xf86Info.kbdFd);
 	     return FALSE;
      }
-#endif
+     close (xf86Info.kbdFd);
+#endif /* WSCONS_SUPPORT */
   } else {
     xf86ConfigError("\"%s\" is not a valid keyboard protocol name", s);
     xfree(s);