diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2023-06-15 16:58:45 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2023-06-15 16:58:45 +0200 |
| commit | 6ac755aff400873a2a62f18948f32a14d8725bd8 (patch) | |
| tree | 83e0d80c1f4c04f1026b89f1012db67edd60252c /Xtransint.h | |
| parent | 495fa1b46b2937e199052e1e40a2a2072dd11888 (diff) | |
| parent | 3b3a3bd75d86aec78f6ef893b198c3efc378bc64 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'Xtransint.h')
| -rw-r--r-- | Xtransint.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Xtransint.h b/Xtransint.h index fe1f117..a43f7f8 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -297,7 +297,9 @@ typedef struct _Xtransport_table { #define TRANS_DISABLED (1<<2) /* Don't open this one */ #define TRANS_NOLISTEN (1<<3) /* Don't listen on this one */ #define TRANS_NOUNLINK (1<<4) /* Don't unlink transport endpoints */ -#define TRANS_ABSTRACT (1<<5) /* Use abstract sockets if available */ +#define TRANS_ABSTRACT (1<<5) /* This previously meant that abstract sockets should be used available. For security + * reasons, this is now a no-op on the client side, but it is still supported for servers. + */ #define TRANS_NOXAUTH (1<<6) /* Don't verify authentication (because it's secure some other way at the OS layer) */ #define TRANS_RECEIVED (1<<7) /* The fd for this has already been opened by someone else. */ @@ -351,11 +353,6 @@ static int TRANS(WriteV)( #endif /* WIN32 */ - -static int is_numeric ( - const char * /* str */ -); - #ifdef TRANS_SERVER static int trans_mkdir ( const char *, /* path */ @@ -375,10 +372,11 @@ static int trans_mkdir ( #include <stdarg.h> /* - * The X server provides ErrorF() & VErrorF(), for other software that uses - * xtrans, we provide our own simple versions. + * The X server and the font server both provide ErrorF() & VErrorF(). For + * other software that uses xtrans, we provide our own simple + * versions. */ -# if defined(XSERV_t) && defined(TRANS_SERVER) +# if (defined(XSERV_t) || defined(TRANS_HAS_ERRORF)) && defined(TRANS_SERVER) # include "os.h" # else static inline void _X_ATTRIBUTE_PRINTF(1, 0) |