Part 2 of prior commit

1 files changed, 0 insertions, 219 deletions

diff --git a/kdm/backend/netaddr.c b/kdm/backend/netaddr.c
deleted file mode 100644
index 349a53528..000000000
--- a/kdm/backend/netaddr.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
-
-Copyright 1991, 1998  The Open Group
-Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the copyright holder.
-
-*/
-
-/*
- * xdm - display manager daemon
- * Author: Keith Packard, MIT X Consortium
- *
- * netaddr.c - Interpretation of XdmcpNetaddr object.
- */
-
-#include "dm.h"
-#include "dm_socket.h"
-#include "dm_error.h"
-
-/* given an char *, returns the socket protocol family used,
-   e.g., AF_INET */
-
-int
-NetaddrFamily( char *netaddrp )
-{
-#ifdef STREAMSCONN
-	short family = *(short *)netaddrp;
-	return family;
-#else
-	return ((struct sockaddr *)netaddrp)->sa_family;
-#endif
-}
-
-
-/* given an char *, returns a pointer to the TCP/UDP port used
-   and sets *lenp to the length of the address
-   or 0 if not using TCP or UDP. */
-
-char *
-NetaddrPort( char *netaddrp, int *lenp )
-{
-#ifdef STREAMSCONN
-	*lenp = 2;
-	return netaddrp+2;
-#else
-	switch (NetaddrFamily( netaddrp ))
-	{
-	case AF_INET:
-		*lenp = 2;
-		return (char *)&(((struct sockaddr_in *)netaddrp)->sin_port);
-#if defined(IPv6) && defined(AF_INET6)
-	case AF_INET6:
-		*lenp = 2;
-		return (char *)&(((struct sockaddr_in6 *)netaddrp)->sin6_port);
-#endif
-	default:
-		*lenp = 0;
-		return NULL;
-	}
-#endif
-}
-
-
-/* given an char *, returns a pointer to the network address
-   and sets *lenp to the length of the address */
-
-char *
-NetaddrAddress( char *netaddrp, int *lenp )
-{
-#ifdef STREAMSCONN
-	*lenp = 4;
-	return netaddrp+4;
-#else
-	switch (NetaddrFamily( netaddrp )) {
-#ifdef UNIXCONN
-	case AF_UNIX:
-		*lenp = strlen( ((struct sockaddr_un *)netaddrp)->sun_path );
-		return (char *)(((struct sockaddr_un *)netaddrp)->sun_path);
-#endif
-#ifdef TCPCONN
-	case AF_INET:
-		*lenp = sizeof(struct in_addr);
-		return (char *)&(((struct sockaddr_in *)netaddrp)->sin_addr);
-#if defined(IPv6) && defined(AF_INET6)
-	case AF_INET6:
-	{
-		struct in6_addr *a = &(((struct sockaddr_in6 *)netaddrp)->sin6_addr);
-		if (IN6_IS_ADDR_V4MAPPED( a )) {
-			*lenp = sizeof(struct in_addr);
-			return ((char *)&(a->s6_addr))+12;
-		} else {
-			*lenp = sizeof(struct in6_addr);
-			return (char *)&(a->s6_addr);
-		}
-	}
-#endif
-#endif
-#ifdef DNETCONN
-	case AF_DECnet:
-		*lenp = sizeof(struct dn_naddr);
-		return (char *)&(((struct sockaddr_dn *)netaddrp)->sdn_add);
-#endif
-#ifdef AF_CHAOS
-	case AF_CHAOS:
-#endif
-	default:
-		*lenp = 0;
-		return NULL;
-	}
-#endif /* STREAMSCONN else */
-}
-
-
-/* given an char *, sets *addr to the network address used and
-   sets *len to the number of bytes in addr.
-   Returns the X protocol family used, e.g., FamilyInternet */
-
-int
-ConvertAddr( char *saddr, int *len, char **addr )
-{
-	int retval;
-
-	if (len == NULL)
-		return -1;
-	*addr = NetaddrAddress( saddr, len );
-#ifdef STREAMSCONN
-	/* kludge */
-	if (NetaddrFamily( saddr ) == 2)
-		retval = FamilyInternet;
-#else
-	switch (NetaddrFamily( saddr )) {
-#ifdef AF_UNSPEC
-	  case AF_UNSPEC:
-		retval = FamilyLocal;
-		break;
-#endif
-#ifdef AF_UNIX
-#ifndef __hpux
-	  case AF_UNIX:
-		retval = FamilyLocal;
-		break;
-#endif
-#endif
-#ifdef TCPCONN
-	  case AF_INET:
-		retval = FamilyInternet;
-		break;
-#if defined(IPv6) && defined(AF_INET6)
-	  case AF_INET6:
-		if (*len == sizeof(struct in_addr))
-			retval = FamilyInternet;
-		else
-			retval = FamilyInternet6;
-		break;
-#endif
-#endif
-#ifdef DNETCONN
-	  case AF_DECnet:
-		retval = FamilyDECnet;
-		break;
-#endif
-#ifdef AF_CHAOS
-	case AF_CHAOS:
-		retval = FamilyChaos;
-		break;
-#endif
-	  default:
-		retval = -1;
-		break;
-	}
-#endif /* STREAMSCONN else */
-	Debug( "ConvertAddr returning %d for family %d\n", retval,
-	       NetaddrFamily( saddr ) );
-	return retval;
-}
-
-#ifdef XDMCP
-int
-addressEqual( char *a1, int len1, char *a2, int len2 )
-{
-	int partlen1, partlen2;
-	char *part1, *part2;
-
-	if (len1 != len2)
-		return FALSE;
-	if (NetaddrFamily( a1 ) != NetaddrFamily( a2 ))
-		return FALSE;
-	part1 = NetaddrPort( a1, &partlen1 );
-	part2 = NetaddrPort( a2, &partlen2 );
-	if (partlen1 != partlen2 || memcmp( part1, part2, partlen1 ) != 0)
-		return FALSE;
-	part1 = NetaddrAddress( a1, &partlen1 );
-	part2 = NetaddrAddress( a2, &partlen2 );
-	if (partlen1 != partlen2 || memcmp( part1, part2, partlen1 ) != 0)
-		return FALSE;
-	return TRUE;
-}
-#endif