PSARC 2007/282 DLPI MAC-Type Mapping Functions

4714297 libdlpi ought to detect stream hangup properly
6397009 core dumped from get_ethernet_address()
6505649 need DLPI type mapping routines
6524620 dlpi_to_arp belongs in libdlpi, not libdhcputil
6524636 dhcpagent should be ported to libdlpi
6534006 libuuid should be ported to libdlpi
6534017 zoneadm should be ported to libdlpi
6534023 in.rarpd should be ported to libdlpi
6534263 show_linkprop_onelink() should use dlpi_open() instead of open()
6549358 64-bit version of libdladm needed for libuuid
6562226 fsck should link to libraries instead of directly pulling source

--HG--
rename : usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.c => deleted_files/usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.c
rename : usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.h => deleted_files/usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.h
rename : usr/src/cmd/zoneadm/dlprims.c => deleted_files/usr/src/cmd/zoneadm/dlprims.c

4 files changed, 67 insertions, 3 deletions

diff --git a/usr/src/lib/libdladm/Makefile b/usr/src/lib/libdladm/Makefile
index 77c7824ae4..c1aa64b78b 100644
--- a/usr/src/lib/libdladm/Makefile
+++ b/usr/src/lib/libdladm/Makefile
@@ -32,6 +32,7 @@ HDRS =		libdladm.h libdladm_impl.h libdllink.h libdlaggr.h	\
 HDRDIR =	common
 
 SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 POFILE =	libdladm.po
 MSGFILES =	common/libdladm.c common/linkprop.c common/secobj.c	\
diff --git a/usr/src/lib/libdladm/amd64/Makefile b/usr/src/lib/libdladm/amd64/Makefile
new file mode 100644
index 0000000000..51f031cb3e
--- /dev/null
+++ b/usr/src/lib/libdladm/amd64/Makefile
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c
index 0e0f990b7d..21ea999749 100644
--- a/usr/src/lib/libdladm/common/linkprop.c
+++ b/usr/src/lib/libdladm/common/linkprop.c
@@ -437,7 +437,8 @@ process_linkprop_init(linkprop_db_state_t *lsp, char *buf,
 		 * values from listp.
 		 */
 		for (lvp = lip->li_val, valcnt = 0;
-		    lvp != NULL; lvp = lvp->lv_nextval, valcnt++);
+		    lvp != NULL; lvp = lvp->lv_nextval, valcnt++)
+			;
 
 		propval = malloc(sizeof (char *) * valcnt);
 		if (propval == NULL) {
@@ -880,7 +881,7 @@ do_set_zone(const char *link, val_desc_t *vdp, uint_t val_cnt)
 		return (status);
 
 	/* Do nothing if setting to current value */
-	zid_new = (zoneid_t)vdp->vd_val;
+	zid_new = (intptr_t)(void *)vdp->vd_val;
 	if (zid_new == zid_old)
 		return (DLADM_STATUS_OK);
 
@@ -963,7 +964,7 @@ do_check_zone(prop_desc_t *pdp, char **prop_val, uint_t val_cnt,
 	if (vdp == NULL)
 		return (DLADM_STATUS_NOMEM);
 
-	vdp->vd_val = (void *)zid;
+	vdp->vd_val = (void *)(uintptr_t)zid;
 	*vdpp = vdp;
 	return (DLADM_STATUS_OK);
 }
diff --git a/usr/src/lib/libdladm/sparcv9/Makefile b/usr/src/lib/libdladm/sparcv9/Makefile
new file mode 100644
index 0000000000..51f031cb3e
--- /dev/null
+++ b/usr/src/lib/libdladm/sparcv9/Makefile
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)