From 00ebfaf535801a8600ac48319b43b9c28e5f6749 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 13:33:51 +0200 Subject: Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and TRANS_REOPEN if not yet defined. --- nx-X11/programs/Xserver/os/connection.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index fd9741389..c1749d26a 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -72,9 +72,15 @@ SOFTWARE. #endif #include #include -#define XSERV_t -#define TRANS_SERVER -#define TRANS_REOPEN +#ifndef XSERV_t +# define XSERV_t +#endif +#ifndef TRANS_SERVER +# define TRANS_SERVER +#endif +#ifndef TRANS_REOPEN +# define TRANS_REOPEN +#endif #include #include #include -- cgit v1.2.3 From bad0e8bdd32bf8bc741ad64a37a9318655f26068 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 13:35:06 +0200 Subject: Xserver/os/connection.c: Drop unused variable 'restore_trans_conn' from ClientAuthorized(). --- nx-X11/programs/Xserver/os/connection.c | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index c1749d26a..78ed47f1d 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -688,7 +688,6 @@ ClientAuthorized(ClientPtr client, XID auth_id; char *reason = NULL; XtransConnInfo trans_conn; - int restore_trans_conn = 0; priv = (OsCommPtr)client->osPrivate; trans_conn = priv->trans_conn; -- cgit v1.2.3 From b5cceb740b60b62ab7d79c0ad4c00810b983efc5 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 29 Jun 2016 13:45:20 +0200 Subject: os: Make sure that writing our pid to the lock file actually worked There's no sense verifying that we can create the lock file and then ignoring the return value from write. Signed-off-by: Keith Packard Reviewed-by: Jamey Sharp Backport to nx-libs: Mike Gabriel --- nx-X11/programs/Xserver/os/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index f5f09c320..43d92ed98 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -411,7 +411,9 @@ LockServer(void) if (lfd < 0) FatalError("Could not create lock file in %s\n", tmp); (void) sprintf(pid_str, "%10ld\n", (long)getpid()); - (void) write(lfd, pid_str, 11); + if (write(lfd, pid_str, 11) != 11) + FatalError("Could not write pid to lock file in %s\n", tmp); + #ifndef __UNIXOS2__ #ifndef USE_CHMOD (void) fchmod(lfd, 0444); -- cgit v1.2.3 From f46af7de8496522e0d90448497fd019afafc8747 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 29 Jun 2016 13:57:05 +0200 Subject: Restore compression of duplicate log file entries. This undoes the workaround for X.org bug #964, which was an Xprintism. --- nx-X11/programs/Xserver/os/log.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index d97317819..780a05767 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -561,15 +561,6 @@ VAuditF(const char *f, va_list args) prefix = AuditPrefix(); len = vsnprintf(buf, sizeof(buf), f, args); -#if 1 - /* XXX Compressing duplicated messages is temporarily disabled to - * work around bugzilla 964: - * https://freedesktop.org/bugzilla/show_bug.cgi?id=964 - */ - ErrorF("%s%s", prefix != NULL ? prefix : "", buf); - oldlen = -1; - nrepeat = 0; -#else if (len == oldlen && strcmp(buf, oldbuf) == 0) { /* Message already seen */ nrepeat++; @@ -583,7 +574,6 @@ VAuditF(const char *f, va_list args) nrepeat = 0; auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL); } -#endif if (prefix != NULL) free(prefix); } -- cgit v1.2.3 From 141316af0d45968b95c3fb5c08516dd6e93ac64e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 14:05:12 +0200 Subject: Xserver/os/log.c: Make sure strlcpy is defined in log.c. Immitate what is done in X.org. --- nx-X11/programs/Xserver/include/os.h | 7 +++++++ nx-X11/programs/Xserver/os/log.c | 1 + 2 files changed, 8 insertions(+) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index aaff63811..6e629c42f 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -457,6 +457,13 @@ extern void AbortDDX(void); extern void ddxGiveUp(void); extern int TimeSinceLastInputEvent(void); +#ifndef HAVE_STRLCPY +extern _X_EXPORT size_t +strlcpy(char *dst, const char *src, size_t siz); +extern _X_EXPORT size_t +strlcat(char *dst, const char *src, size_t siz); +#endif + /* Logging. */ typedef enum _LogParameter { XLOG_FLUSH, diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 780a05767..d8640b5fd 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -107,6 +107,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include /* for malloc() */ #include +#include "input.h" #include "site.h" #include "opaque.h" -- cgit v1.2.3 From a8fd16ce61113f54391a2a58c9ad00466b67af98 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 14:09:52 +0200 Subject: Xserver/os/xdmauth.c: Avoid compiler warnings due to -Wswitch being enabled. Use if statement rather than switch. Backported from X.org. Found in commit... commit 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab Author: Adam Jackson Date: Tue Mar 28 01:21:00 2006 +0000 --- nx-X11/programs/Xserver/os/xdmauth.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/os') diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index a89c5b0c0..c2796fba1 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -70,9 +70,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, XdmcpUnwrap (incomingData->data, &privateKey, incomingData->data,incomingData->length); - switch (packet_type) - { - case ACCEPT: + if (packet_type == ACCEPT) { if (incomingData->length != 8) return FALSE; incoming = (XdmAuthKeyPtr) incomingData->data; @@ -88,9 +86,7 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData, { outgoingData->length = 0; outgoingData->data = 0; - switch (packet_type) - { - case REQUEST: + if (packet_type == REQUEST) { if (XdmcpAllocARRAY8 (outgoingData, 8)) XdmcpWrap (&rho, &privateKey, outgoingData->data, 8); } -- cgit v1.2.3