Move inet_aton to libomapi

diff --git a/common/Makefile.dist b/common/Makefile.dist
index c3f287ebb98f53e1993d895cd75eeccc30f8ed97..83576521f96215113b25d204fb3fdda80fadf0d1 100644 (file)
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -22,11 +22,11 @@ SEDMANPAGES = dhcp-options.man5 dhcp-contrib.man5 dhcp-eval.man5
 SRC    = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
         lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c options.c \
         inet.c tree.c tables.c alloc.c fddi.c \
-        inet_addr.c dns.c resolv.c execute.c discover.c comapi.c
+        dns.c resolv.c execute.c discover.c comapi.c
 OBJ    = raw.o parse.o nit.o icmp.o dispatch.o conflex.o upf.o bpf.o socket.o \
         lpf.o dlpi.o packet.o tr.o ethernet.o memory.o print.o options.o \
         inet.o tree.o tables.o alloc.o fddi.o \
-        inet_addr.o dns.o resolv.o execute.o discover.o comapi.o
+        dns.o resolv.o execute.o discover.o comapi.o
 MAN    = dhcp-options.5 dhcp-contrib.5 dhcp-eval.5
 
 DEBUG  = -g

diff --git a/omapip/Makefile.dist b/omapip/Makefile.dist
index b479107b0b2c7a83f44e2454f3610c7b8c44b323..98ccbbe20aeb5b86943449f1aa9a28feb8bd38a0 100644 (file)
--- a/omapip/Makefile.dist
+++ b/omapip/Makefile.dist
@@ -21,10 +21,10 @@ CATMANPAGES = omapi.cat3
 SEDMANPAGES = omapi.man3
 SRC    = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
         listener.c dispatch.c generic.c support.c handle.c message.c \
-        convert.c hash.c auth.c
+        convert.c hash.c auth.c inet_addr.c
 OBJ    = protocol.o buffer.o alloc.o result.o connection.o errwarn.o \
         listener.o dispatch.o generic.o support.o handle.o message.o \
-        convert.o hash.o auth.o
+        convert.o hash.o auth.o inet_addr.o
 MAN    = omapi.3
 
 DEBUG  = -g

diff --git a/common/inet_addr.c b/omapip/inet_addr.c
similarity index 97%
rename from common/inet_addr.c
rename to omapip/inet_addr.c
index 98267b791562b46a2f293dd8bc7136eb3c357745..0e7967cd2794a183b6821d9b27df77735aa65965 100644 (file)
--- a/common/inet_addr.c
+++ b/omapip/inet_addr.c
@@ -43,10 +43,10 @@ static char rcsid[] = "$NetBSD: inet_addr.c,v 1.6 1996/02/02 15:22:23 mrg Exp $"
 
 #ifndef lint
 static char copyright[] =
-"$Id: inet_addr.c,v 1.3 1999/03/16 06:37:49 mellon Exp $ Copyright (c) 1983, 1990, 1993 The Regents of the University of California.  All rights reserved.\n";
+"$Id: inet_addr.c,v 1.1 2000/09/20 00:01:50 mellon Exp $ Copyright (c) 1983, 1990, 1993 The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#include "dhcpd.h"
+#include "omapip/omapip_p.h"
 
 #ifdef NEED_INET_ATON
 /*