Skip to content

N
nx-libs
Commit 2d59daca authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan
Browse files
Options

Lift os to XORG-7_1 state

parent 78724c48
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
nx-X11/programs/Xserver/os/osdep.h
View file @ 2d59daca
...@@ -111,9 +111,11 @@ SOFTWARE. ...@@ -111,9 +111,11 @@ SOFTWARE.
/* MAXSELECT is the number of fds that select() can handle */ /* MAXSELECT is the number of fds that select() can handle */
#define MAXSELECT (sizeof(fd_set) * NBBY) #define MAXSELECT (sizeof(fd_set) * NBBY)
#ifndef HAS_GETDTABLESIZE
#if !defined(SVR4) && !defined(SYSV) #if !defined(SVR4) && !defined(SYSV)
#define HAS_GETDTABLESIZE #define HAS_GETDTABLESIZE
#endif #endif
#endif
#include <stddef.h> #include <stddef.h>
......
nx-X11/programs/Xserver/os/utils.c
View file @ 2d59daca
...@@ -168,9 +168,6 @@ Bool noDamageExtension = FALSE; ...@@ -168,9 +168,6 @@ Bool noDamageExtension = FALSE;
#ifdef DBE #ifdef DBE
Bool noDbeExtension = FALSE; Bool noDbeExtension = FALSE;
#endif #endif
#ifdef DPSEXT
Bool noDPSExtension = FALSE;
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
Bool noDPMSExtension = FALSE; Bool noDPMSExtension = FALSE;
#endif #endif
......
nx-X11/programs/Xserver/os/xdmauth.c
View file @ 2d59daca
...@@ -439,10 +439,12 @@ XdmToID (unsigned short cookie_length, char *cookie) ...@@ -439,10 +439,12 @@ XdmToID (unsigned short cookie_length, char *cookie)
{ {
free (client); free (client);
free (cookie); free (cookie);
free (plain);
return auth->id; return auth->id;
} }
} }
free (cookie); free (cookie);
free (plain);
return (XID) -1; return (XID) -1;
} }
...@@ -464,10 +466,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap) ...@@ -464,10 +466,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap)
int int
XdmRemoveCookie (unsigned short data_length, char *data) XdmRemoveCookie (unsigned short data_length, char *data)
{ {
XdmAuthorizationPtr auth, prev; XdmAuthorizationPtr auth;
XdmAuthKeyPtr key_bits, rho_bits; XdmAuthKeyPtr key_bits, rho_bits;
prev = 0;
switch (data_length) switch (data_length)
{ {
case 16: case 16:
...@@ -487,9 +488,6 @@ XdmRemoveCookie (unsigned short data_length, char *data) ...@@ -487,9 +488,6 @@ XdmRemoveCookie (unsigned short data_length, char *data)
if (XdmcpCompareKeys (rho_bits, &auth->rho) && if (XdmcpCompareKeys (rho_bits, &auth->rho) &&
XdmcpCompareKeys (key_bits, &auth->key)) XdmcpCompareKeys (key_bits, &auth->key))
{ {
if (prev)
prev->next = auth->next;
else
xdmAuth = auth->next; xdmAuth = auth->next;
free (auth); free (auth);
return 1; return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment