diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | os/connection.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 38ab8134f..93e3a60c5 100644 --- a/configure.ac +++ b/configure.ac @@ -658,7 +658,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. -REQUIRED_MODULES="[randrproto >= 1.2] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] xtrans bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.5] [kbproto >= 1.0.3]" +REQUIRED_MODULES="[randrproto >= 1.2] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.5] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas diff --git a/os/connection.c b/os/connection.c index e80b95eb8..64b0a0be6 100644 --- a/os/connection.c +++ b/os/connection.c @@ -663,11 +663,6 @@ ClientAuthorized(ClientPtr client, priv = (OsCommPtr)client->osPrivate; trans_conn = priv->trans_conn; -/* Make it compile for now, remove this once we have a new xtrans release and are depending on it in configure.ac */ -#ifndef TRANS_NOXAUTH -#define TRANS_NOXAUTH 0 -#endif - /* Allow any client to connect without authorization on a launchd socket, because it is securely created -- this prevents a race condition on launch */ if(trans_conn->flags | TRANS_NOXAUTH) { |