frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some remaining AMOEBA specific code.

This commit is contained in:
Matthieu Herrb 2004-10-17 10:46:14 +00:00
parent 5505555c15
commit 9a0cf1eb43
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/access.c
View File

@ -1,5 +1,5 @@
/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.4 2004/06/30 20:06:56 kem Exp $ */ /* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.5 2004/07/17 01:13:31 alanc Exp $ */
/*********************************************************** /***********************************************************
Copyright 1987, 1998 The Open Group Copyright 1987, 1998 The Open Group
@ -1739,7 +1739,7 @@ CheckAddr (
switch (family) switch (family)
{ {
#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) || defined(MNX_TCPCONN) #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
case FamilyInternet: case FamilyInternet:
if (length == sizeof (struct in_addr)) if (length == sizeof (struct in_addr))
len = length; len = length;

23
os/connection.c
View File

@ -127,12 +127,6 @@ extern __const__ int _nfiles;
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef AMTCPCONN
#include <server/ip/types.h>
#include <server/ip/gen/in.h>
#include <server/ip/gen/inet.h>
#endif
#if !defined(__UNIXOS2__) #if !defined(__UNIXOS2__)
#ifndef Lynx #ifndef Lynx
#include <sys/uio.h> #include <sys/uio.h>
@ -516,16 +510,6 @@ AuthAudit (ClientPtr client, Bool letin,
sprintf(out, "DN %s", sprintf(out, "DN %s",
dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add)); dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add));
break; break;
#endif
#ifdef AMRPCCONN
case FamilyAmoeba:
sprintf(addr, "AM %s", saddr);
break;
#endif
#if defined(AMTCPCONN) && !(defined(TCPCONN) || defined(STREAMSCONN))
case AF_INET:
sprintf(addr, "AMIP %s", inet_ntoa(*((ipaddr_t *) saddr)));
break;
#endif #endif
default: default:
strcpy(out, "unknown address"); strcpy(out, "unknown address");
@ -650,13 +634,6 @@ ClientAuthorized(ClientPtr client,
_XSERVTransGetPeerAddr (trans_conn, _XSERVTransGetPeerAddr (trans_conn,
&family, &fromlen, &from) != -1) &family, &fromlen, &from) != -1)
{ {
#ifdef AMRPCCONN
/* Amoeba RPC connections are already checked by the capability. */
if (family == FamilyAmoeba) {
auth_id = (XID) 0;
}
else
#endif
if ( if (
#ifdef LBX #ifdef LBX
!trans_conn || !trans_conn ||