[xserver-commit] xserver/os Makefile.am,3.7,3.8 connection.c,3.62,3.63 hpsocket.c,1.3,1.4 xdmauth.c,1.13,1.14

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/os
In directory pdx:/tmp/cvs-serv23831/os

Modified Files:
	Makefile.am connection.c hpsocket.c xdmauth.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/os/Makefile.am,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- Makefile.am	30 Oct 2003 23:41:46 -0000	3.7
+++ Makefile.am	2 Nov 2003 19:56:11 -0000	3.8
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	-D_BSD_SOURCE -D_SVID_SOURCE  		\
 	-D_GNU_SOURCE -D_XOPEN_SOURCE		\
-	-D_POSIX_SOURCE $(XSERVER_CFLAGS)
+	-D_POSIX_SOURCE @XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libos.a
 
@@ -9,7 +9,9 @@
 #	lbxio.c		\
 #	rpcauth.c	\
 #	genalloca.c	\
+#	hpsocket.c	\
 #	secauth.c
+#	xalloc.c
 
 if XDMCP
 XDMCP_SOURCES = xdmcp.c
@@ -20,7 +22,6 @@
 	access.c	\
 	auth.c		\
 	connection.c	\
-	hpsocket.c	\
 	io.c		\
 	mitauth.c	\
 	oscolor.c	\
@@ -28,5 +29,4 @@
 	utils.c		\
 	xdmauth.c	\
 	xstrans.c	\
-	xalloc.c	\
 	$(XDMCP_SOURCES)

Index: connection.c
===================================================================
RCS file: /cvs/xserver/xserver/os/connection.c,v
retrieving revision 3.62
retrieving revision 3.63
diff -u -d -r3.62 -r3.63
--- connection.c	29 Sep 2003 01:42:40 -0000	3.62
+++ connection.c	2 Nov 2003 19:56:11 -0000	3.63
@@ -576,8 +576,10 @@
     XID	 		auth_id;
     char	 	*reason = NULL;
     XtransConnInfo	trans_conn;
+#ifdef LBX
     int			restore_trans_conn = 0;
     ClientPtr           lbxpc = NULL;
+#endif
 
     priv = (OsCommPtr)client->osPrivate;
     trans_conn = priv->trans_conn;

Index: hpsocket.c
===================================================================
RCS file: /cvs/xserver/xserver/os/hpsocket.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hpsocket.c	11 Sep 2003 05:12:51 -0000	1.3
+++ hpsocket.c	2 Nov 2003 19:56:11 -0000	1.4
@@ -38,9 +38,7 @@
 #include <sys/socket.h>
 
 int
-set_socket_option (socket_id, option)
-int socket_id;
-char option;
+set_socket_option (int socket_id, char option)
 {
 	int optlen = 1;
 	char optval = 0x0;
@@ -54,9 +52,7 @@
 
 
 int
-unset_socket_option (socket_id, option)
-int socket_id;
-char option;
+unset_socket_option (int socket_id, char option)
 {
 	int optlen = 1;
 	char optval = 0x0;

Index: xdmauth.c
===================================================================
RCS file: /cvs/xserver/xserver/os/xdmauth.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xdmauth.c	31 Oct 2003 23:45:51 -0000	1.13
+++ xdmauth.c	2 Nov 2003 19:56:11 -0000	1.14
@@ -48,9 +48,9 @@
 
 #ifdef HASXDMAUTH
 
+#ifdef XDMCP
 static Bool authFromXDMCP;
 
-#ifdef XDMCP
 #include <X11/Xmd.h>
 #undef REQUEST
 
@@ -389,8 +389,8 @@
     if (!plain)
 	return (XID) -1;
     for (auth = xdmAuth; auth; auth=auth->next) {
-	XdmcpUnwrap (cookie, &auth->key, plain, cookie_length);
-	if (client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason))
+	XdmcpUnwrap (cookie, (unsigned char *) &auth->key, plain, cookie_length);
+	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)))
 	{
 	    client->next = xdmClients;
 	    xdmClients = client;
@@ -434,8 +434,8 @@
     if (!plain)
 	return (XID) -1;
     for (auth = xdmAuth; auth; auth=auth->next) {
-	XdmcpUnwrap (cookie, &auth->key, plain, cookie_length);
-	if (client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL))
+	XdmcpUnwrap (cookie, (unsigned char *) &auth->key, plain, cookie_length);
+	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)))
 	{
 	    xfree (client);
 	    xfree (cookie);