Subject: Re: install/13266: x_dhclient fails to build in distrib subtree
To: None <gnats-bugs@gnats.netbsd.org>
From: Mark Davies <mark@mcs.vuw.ac.nz>
List: netbsd-bugs
Date: 06/21/2001 16:13:42
OK here is a better patch (this one links)

Index: /src/work/src/usr.sbin/dhcp/client/dhclient.c
===================================================================
RCS file: /src/cvs/netbsd/basesrc/usr.sbin/dhcp/client/dhclient.c,v
retrieving revision 1.39
diff -u -r1.39 dhclient.c
--- /src/work/src/usr.sbin/dhcp/client/dhclient.c	2001/06/18 19:01:52	1.39
+++ /src/work/src/usr.sbin/dhcp/client/dhclient.c	2001/06/21 03:15:26
@@ -2974,6 +2974,7 @@
 
 void client_dns_update (struct client_state *client, int addp)
 {
+#ifdef NSUPDATE
 	struct data_string ddns_fqdn, ddns_fwd_name,
 	       ddns_dhcid, client_identifier;
 	struct option_cache *oc;
@@ -3074,4 +3075,5 @@
 	
 	data_string_forget (&ddns_fwd_name, MDL);
 	data_string_forget (&ddns_dhcid, MDL);
+#endif
 }
Index: /src/work/src/usr.sbin/dhcp/common/comapi.c
===================================================================
RCS file: /src/cvs/netbsd/basesrc/usr.sbin/dhcp/common/comapi.c,v
retrieving revision 1.8
diff -u -r1.8 comapi.c
--- /src/work/src/usr.sbin/dhcp/common/comapi.c	2001/06/18 19:01:53	1.8
+++ /src/work/src/usr.sbin/dhcp/common/comapi.c	2001/06/21 03:18:39
@@ -570,6 +570,7 @@
 		return ISC_R_INVALIDARG;
 	control = (dhcp_control_object_t *)h;
 
+#if !defined (SMALL)
 	/* Write out all the values. */
 	status = omapi_connection_put_name (c, "state");
 	if (status != ISC_R_SUCCESS)
@@ -580,6 +581,7 @@
 	status = omapi_connection_put_uint32 (c, control -> state);
 	if (status != ISC_R_SUCCESS)
 		return status;
+#endif
 
 	/* Write out the inner object, if any. */
 	if (h -> inner && h -> inner -> type -> stuff_values) {
Index: /src/work/src/distrib/utils/x_dhclient/Src-omapip
===================================================================
RCS file: /src/cvs/netbsd/basesrc/distrib/utils/x_dhclient/Src-omapip,v
retrieving revision 1.6
diff -u -r1.6 Src-omapip
--- /src/work/src/distrib/utils/x_dhclient/Src-omapip	2001/04/06 18:53:33	1.6
+++ /src/work/src/distrib/utils/x_dhclient/Src-omapip	2001/06/21 03:23:39
@@ -2,4 +2,4 @@
 
 OMSRCS=	array.c alloc.OM.c result.c \
 	errwarn.c dispatch.OM.c support.OM.c handle.c \
-	hash.OM.c
+	hash.OM.c toisc.c


cheers
mark