Rhapsody support

diff --git a/Makefile.conf b/Makefile.conf
index bb2d3c0a03bd8ebd39e3849c0c91bf21a5634547..df04180863024a6e987366505522a6e74ebdddcf 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -145,6 +145,14 @@ VARDB = /var/db
 #SCRIPT=freebsd
 ##--freebsd--
 
+## Rhapsody
+##--rhapsody--
+#CF = cf/rhapsody.h
+#COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#        -Wno-uninitialized -Werror -pipe
+#SCRIPT=rhapsody
+##--rhapsody--
+
 ## NetBSD
 ##--netbsd--
 #CF = cf/netbsd.h

diff --git a/configure b/configure
index dc56c069e049201a75b247b3c52a1bb9aac77d32..7d5fe3710091dcdd9faf0255c046b32a867345b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,6 +7,8 @@ machine=`uname -m`
 
 if [ "$sysname" = "" ]; then
   case $uname in
+    Rhapsody)
+      sysname=rhapsody;;
     ULTRIX)
       sysname=ultrix;;
     BSD/OS)

diff --git a/includes/cf/rhapsody.h b/includes/cf/rhapsody.h
new file mode 100644 (file)
index 0000000..604e090
--- /dev/null
+++ b/includes/cf/rhapsody.h
@@ -0,0 +1,95 @@
+/* netbsd.h
+
+   System dependencies for NetBSD... */
+
+/*
+ * Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of The Internet Software Consortium nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software was written for the Internet Software Consortium by Ted Lemon
+ * under a contract with Vixie Laboratories.
+ */
+
+#include <syslog.h>
+#include <sys/types.h>
+#include <string.h>
+#include <paths.h>
+#include <errno.h>
+#include <unistd.h>
+#include <setjmp.h>
+#include <limits.h>
+
+#include <sys/wait.h>
+#include <signal.h>
+
+extern int h_errno;
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <sys/sockio.h>
+
+#define ifr_netmask ifr_addr
+
+/* Varargs stuff... */
+#include <stdarg.h>
+#define VA_DOTDOTDOT ...
+#define va_dcl
+#define VA_start(list, last) va_start (list, last)
+
+#ifndef _PATH_DHCPD_PID
+#define _PATH_DHCPD_PID        "/var/run/dhcpd.pid"
+#endif
+#ifndef _PATH_DHCPD_DB
+#define _PATH_DHCPD_DB "/var/db/dhcpd.leases"
+#endif
+#ifndef _PATH_DHCLIENT_PID
+#define _PATH_DHCLIENT_PID "/var/run/dhclient.pid"
+#endif
+#ifndef _PATH_DHCLIENT_DB
+#define _PATH_DHCLIENT_DB "/var/db/dhclient.leases"
+#endif
+
+#define EOL    '\n'
+#define VOIDPTR void *
+
+/* Time stuff... */
+#include <sys/time.h>
+#define TIME time_t
+#define GET_TIME(x)    time ((x))
+
+#define HAVE_SA_LEN
+#define HAVE_MKSTEMP
+
+#if defined (USE_DEFAULT_NETWORK)
+#  define USE_BPF
+#endif
+
+#ifdef __alpha__
+#define PTRSIZE_64BIT
+#endif

diff --git a/includes/osdep.h b/includes/osdep.h
index deacaedde12573e1ec564432327b8dc779d014b9..4ea4cd863d756b98ed3b1a5021aaa19081c2303b 100644 (file)
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -113,7 +113,11 @@
 #endif
 
 #ifdef NeXT
+# ifdef __APPLE__
+#  include "cf/rhapsody.h"
+# else
 #  include "cf/nextstep.h"
+# endif
 #endif
 
 /* Porting::

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 5a7edb29720b4f53ef67ca1e97690504f7597351..80f382b40812496b3ea68e353a6072287f9071b5 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcrelay.c,v 1.13 1998/06/25 03:39:04 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.14 1998/06/25 18:37:45 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -56,6 +56,12 @@ struct tree_cache *global_options [256];
 
 int log_perror = 1;
 
+/* Needed to prevent linking against conflex.c. */
+int lexline;
+int lexchar;
+char *token_line;
+char *tlname;
+
 char *path_dhcrelay_pid = _PATH_DHCRELAY_PID;
 
 #ifdef USE_FALLBACK