From: Ted Lemon <source@isc.org>
Date: Thu, 9 Sep 1999 21:00:13 +0000 (+0000)
Subject: Add another empty hook for memory.c.   Initialize the OMAPI explicitly.
X-Git-Tag: V3-BETA-1-PATCH-2~5^2~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=628beb0ecd51a6126eb10ae7a490cfe41e69f31e;p=thirdparty%2Fdhcp.git

Add another empty hook for memory.c.   Initialize the OMAPI explicitly.
---

diff --git a/client/dhclient.c b/client/dhclient.c
index 1b71af2bf..4b332df67 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.80 1999/07/31 17:50:41 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.81 1999/09/09 21:00:05 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -78,6 +78,7 @@ int main (argc, argv, envp)
 	int seed;
 	int quiet = 0;
 	char *server = (char *)0;
+	isc_result_t status;
 
 #ifdef SYSLOG_4_2
 	openlog ("dhclient", LOG_NDELAY);
@@ -184,6 +185,12 @@ int main (argc, argv, envp)
 #endif
 	inaddr_any.s_addr = INADDR_ANY;
 
+	/* Set up the OMAPI. */
+	status = omapi_init ();
+	if (status != ISC_R_SUCCESS)
+		log_fatal ("Can't initialize OMAPI: %s",
+			   isc_result_totext (status));
+
 	/* Discover all the network interfaces. */
 	discover_interfaces (DISCOVER_UNCONFIGURED);
 
@@ -722,6 +729,12 @@ int write_lease (lease)
 	return 0;
 }
 
+int write_host (host)
+	struct host_decl *host;
+{
+	return 0;
+}
+
 void db_startup ()
 {
 }
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index bd8a741de..26f9256d5 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcrelay.c,v 1.33 1999/05/07 17:32:38 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.34 1999/09/09 21:00:13 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -105,6 +105,7 @@ int main (argc, argv, envp)
 	struct server_list *sp = (struct server_list *)0;
 	int no_daemon = 0;
 	int quiet = 0;
+	isc_result_t status;
 
 #ifdef SYSLOG_4_2
 	openlog ("dhcrelay", LOG_NDELAY);
@@ -229,6 +230,12 @@ int main (argc, argv, envp)
 	/* Get the current time... */
 	GET_TIME (&cur_time);
 
+	/* Set up the OMAPI. */
+	status = omapi_init ();
+	if (status != ISC_R_SUCCESS)
+		log_fatal ("Can't initialize OMAPI: %s",
+			   isc_result_totext (status));
+
 	/* Discover all the network interfaces. */
 	discover_interfaces (DISCOVER_RELAY);
 
@@ -422,6 +429,12 @@ int write_lease (lease)
 	return 1;
 }
 
+int write_host (host)
+	struct host_decl *host;
+{
+	return 1;
+}
+
 int commit_leases ()
 {
 	return 1;