[X2Go-Commits] [nx-libs] 18/30: Lift os to XORG-7_1 state

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 2d59daca2fbc7ac26aa2b47c45dfed51278f0e71
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Nov 5 13:26:04 2017 +0100

    Lift os to XORG-7_1 state
---
 nx-X11/programs/Xserver/os/osdep.h   |  2 ++
 nx-X11/programs/Xserver/os/utils.c   |  3 ---
 nx-X11/programs/Xserver/os/xdmauth.c | 10 ++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index d3e9d0b..01ae7c3 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -111,9 +111,11 @@ SOFTWARE.
 /* MAXSELECT is the number of fds that select() can handle */
 #define MAXSELECT (sizeof(fd_set) * NBBY)
 
+#ifndef HAS_GETDTABLESIZE
 #if !defined(SVR4) && !defined(SYSV)
 #define HAS_GETDTABLESIZE
 #endif
+#endif
 
 #include <stddef.h>
 
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index a8155f3..2edd8dd 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -168,9 +168,6 @@ Bool noDamageExtension = FALSE;
 #ifdef DBE
 Bool noDbeExtension = FALSE;
 #endif
-#ifdef DPSEXT
-Bool noDPSExtension = FALSE;
-#endif
 #ifdef DPMSExtension
 Bool noDPMSExtension = FALSE;
 #endif
diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c
index 4a59b48..eb89f4b 100644
--- a/nx-X11/programs/Xserver/os/xdmauth.c
+++ b/nx-X11/programs/Xserver/os/xdmauth.c
@@ -439,10 +439,12 @@ XdmToID (unsigned short cookie_length, char *cookie)
 	{
 	    free (client);
 	    free (cookie);
+	    free (plain);
 	    return auth->id;
 	}
     }
     free (cookie);
+    free (plain);
     return (XID) -1;
 }
 
@@ -464,10 +466,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap)
 int
 XdmRemoveCookie (unsigned short data_length, char *data)
 {
-    XdmAuthorizationPtr	auth, prev;
+    XdmAuthorizationPtr	auth;
     XdmAuthKeyPtr	key_bits, rho_bits;
 
-    prev = 0;
     switch (data_length)
     {
     case 16:
@@ -487,10 +488,7 @@ XdmRemoveCookie (unsigned short data_length, char *data)
 	if (XdmcpCompareKeys (rho_bits, &auth->rho) &&
 	    XdmcpCompareKeys (key_bits, &auth->key))
  	{
-	    if (prev)
-		prev->next = auth->next;
-	    else
-		xdmAuth = auth->next;
+	    xdmAuth = auth->next;
 	    free (auth);
 	    return 1;
 	}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git