Re: system/3704: routed has byte ordering issues on non-network

[kindred@purdue.edu (Don Kindred)]

The following reply was made to PR system/3704; it has been noted by GNATS.

From: kindred@purdue.edu (Don Kindred)
To: otto@drijf.net (Otto Moerbeek)
Cc: gnats@openbsd.org
Subject: Re: system/3704: routed has byte ordering issues on non-network
Date: Wed, 10 Mar 2004 15:30:35 -0500 (EST)

 Below are the unified diffs to make FreeBSD's routed (and rtquery)
 compile cleanly under OpenBSD.  Before you compile this you'll
 need to install FreeBSD's version of /usr/include/protocols/routed.h.
 I haven't dug that deeply into it... but on cursory inspection, it
 appeared to me that FreeBSD's version supports MD5 encryption of
 passwords.
 
 --Don
 
 Don Kindred			| Email:	kindred@purdue.edu
 AgIT, Purdue University		| Phone:	(765)496-6806
 
 ==========================================================================
 --- Makefile.orig	Mon Feb 23 15:13:56 2004
 +++ Makefile	Wed Mar 10 16:13:38 2004
 @@ -5,7 +5,7 @@
  SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
  MAN=   routed.8
  SUBDIR= rtquery
 -LDADD=	-lmd
 +#LDADD=	-lmd
  DPADD=	${LIBMD}
  #COPTS= -g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
  WARNS?=	0
 ==========================================================================
 --- defs.h.orig	Wed Feb 25 18:45:57 2004
 +++ defs.h	Wed Mar 10 16:18:46 2004
 @@ -162,7 +162,7 @@
  
  
  /* Router Discovery parameters */
 -#ifndef sgi
 +#if !(defined(sgi) || defined(__OpenBSD__))
  #define INADDR_ALLROUTERS_GROUP		0xe0000002  /* 224.0.0.2 */
  #endif
  #define	MaxMaxAdvertiseInterval		1800
 @@ -663,7 +663,7 @@
  extern struct auth *find_auth(struct interface *);
  extern void end_md5_auth(struct ws_buf *, struct auth *);
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  #include <md5.h>
  #else
  #define MD5_DIGEST_LEN 16
 ==========================================================================
 --- rtquery/Makefile.orig	Mon Feb 23 15:17:32 2004
 +++ rtquery/Makefile	Wed Mar 10 16:19:41 2004
 @@ -4,7 +4,7 @@
  
  PROG=	rtquery
  MAN=	rtquery.8
 -LDADD=	-lmd
 +#LDADD=	-lmd
  DPADD=	${LIBMD}
  #COPTS=	-g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
  WARNS?=	0