Age | Commit message (Collapse) | Author |
|
CVE-2020-25697 and the Flatpak documentation show that clients using
abstract sockets without mutual authentication is unsafe.
TRANS_ABSTRACT remains supported, but it is now a no-op on the client
side. Abstract sockets are still supported for servers, as the X server
authenticates the client via other methods.
Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
|
|
XTrans creates custom ErrorF/VErrorF functions when the including
project doesn't provide them, however the test for that is weak and xtrans
ends up using the private versions for the font server as well.
This means that all xtrans error messages will not be included in the
font server log. It also causes redefinition warnings when building
the font server (which is how this problem was identified).
However, the font server doesn't currently provide a VErrorF function,
so instead of just always relying on the font server to provide these
functions, this patch uses a new TRANS_HAS_ERRORF define to select
whether the project-provided or internal versions will be used. A
patch to the font server that adds VErrorF and defines
TRANS_HAS_ERRORF will be required to fix this bug.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Don't define this function unless it is actually going to be used.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
<anholt> ajax: 75419e6b6d985ea8796f05d1acb5e154b065c9b9 of xtrans also
seems to have broken xtest.
And indeed it does, xts5 knows a fair amount about xlib internals for
some reason. Whether that's cromulent or not, we want to be able to run
automatic tests from top-of-tree, so we can't leave this broken.
This reverts commit 75419e6b6d985ea8796f05d1acb5e154b065c9b9.
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
libX11 used to need this in the XOpenDisplay code, but hasn't since xcb
became mandatory.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
Never been used, as far as I can tell.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
No other x86 SysV platforms have ever been supported in the modular
build systems, so we don't need to keep carrying around a bunch of
ifdef's for them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Globally replace #ifdef and #if defined usage of 'sun' with '__sun' such
that strict ISO compiler modes such as -ansi or -std=c99 can be used.
Signed-off-by: Richard PALO <richard@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Also required constifying UnixHostReallyLocal, since SocketUNIXConnect
passes the host arg through to it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
The flag is to be used to mark transports related to sockets
received from systemd.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Stick all of the functions relating to FD passing inside
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Leave it up to the consumer to request this functionality by defining
XTRANS_SEND_FDS.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
v2 - make sure this is only defined on systems where the code actually
works (Linux for now)
|
|
Exposes new TRANS(SendFd)/TRANS(RecvFd) APIs.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Not all the transport variants use all the arguments to every function,
but as long as one transport type needs it, they all get the args passed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Allows using varargs to have the correct number of arguments passed to
get rid of the many gcc warnings about variable printf format strings,
and to reduce the duplication from having 5 implementations of the
PRMSG macro depending on the debug options defined & output method used.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Add #define XTRANS_TRANSPORT_C to transport.c and check for it
before making static function declarations and other bits needed
only when compiling the Xtrans code itself, not from other sources
that include the Xtransint.h header for the struct definitions.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
/usr/X11/include/X11/Xtrans/Xtransint.h:349:12: error: unused function 'is_numeric' [-Werror,-Wunused-function]
static int is_numeric (
^
/usr/X11/include/X11/Xtrans/Xtransint.h:354:12: error: unused function 'trans_mkdir' [-Werror,-Wunused-function]
static int trans_mkdir (
^
In file included from /usr/X11/include/X11/Xtrans/transport.c:67:
...
fatal error: too many errors emitted, stopping now [-ferror-limit=]
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
389e01fb51ba2d708015e27d8fc17c88a0e55802
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
|
|
This reverts commit d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412.
When transport.c is directly include (as in the case of libICE:icetrans.c:32)
Xtranssock.c must be included before Xtransutil.c in order for the socket
structures to be included. Including Xtransutil.c after Xtranssock.c requires
is_number and trans_mkdir to be defined.
This reintroduces the warning until a cleaner solution can be found
but fixes the build.
Found by: Tinderbox
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
|
|
The functions are declared static in Xtransint.h but are defined
in Xtransutil.c. So when someone (xserver/os/connection.c)
incuded Xtransint.h, gcc would throw the warning.
I removed the declarations from the header and rearranged includes
in transport.c so that Xtransutil.c is included just after
Xtransint.h. This way the functions are still defined for the
files that need them (Xtranssock.c, Xtranstli.c).
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
If your OS doesn't have sysconf(3), then life is already hard for you.
|
|
|
|
skip checking xauth" for use with Apple launchd sockets.
|
|
Unlike normal unix sockets, the abstract namespace is not bound to the
filesystem. This has some notable advantages; /tmp need not exist, the
socket directory need not have magic permissions, etc. xtrans servers
will listen on both the normal and abstract socket endpoints; clients
will attempt to connect to the abstract socket before connecting to the
corresponding filesystem socket.
Based on a patch by Bill Crawford.
|
|
"""
It's simply obsolete, sloppy, compiler namespace pollution. The
compiler is not allowed to predefine symbols that might conflict with
ordinary identifiers. For backwards compatibility gcc currently
predefines i386 when compiling for x86 32-bit (but not 64-bit), but that
will go away. It is also not defined if you specify -ansi when invoking
the compiler, because then it is seriously standards compliant. Other
compilers shouldn't define it either. Correct code shouldn't rely on it
being defined. However __i386__ is safe and proper.
"""
|
|
|
|
Convert sprintf -> snprintf
Don't use fake readv/writev on Solaris x86.
|
|
|
|
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|