PSARC 2008/473 Fine-Grained Privileges for Datalink Administration

6695904 least privileges for datalink actions
6729477 pcwl accidentally requires privileges for WLAN_GET_PARAM ioctl
6679049 ucred_t leak in dlmgmtd
6738245 dld's _init() doesn't teardown if mod_install() fails
6738987 i.devpolicy pattern matching accidentally matches random lines

4 files changed, 12 insertions, 12 deletions

diff --git a/usr/src/pkgdefs/SUNWcsd/postinstall b/usr/src/pkgdefs/SUNWcsd/postinstall
index 877f76bc10..b481a763ca 100644
--- a/usr/src/pkgdefs/SUNWcsd/postinstall
+++ b/usr/src/pkgdefs/SUNWcsd/postinstall
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 PATH="/usr/bin:/usr/sbin:$PATH"; export PATH
 
@@ -48,6 +47,7 @@ PATH="/usr/bin:/usr/sbin:$PATH"; export PATH
 prototype_com='
 devices/pseudo/arp@0:arp              dev/arp
 devices/pseudo/clone@0:ibd            dev/ibd
+devices/pseudo/dld@0:ctl              dev/dld
 devices/pseudo/icmp@0:icmp            dev/icmp
 devices/pseudo/icmp@0:icmp            dev/rawip
 devices/pseudo/icmp6@0:icmp6          dev/icmp6
diff --git a/usr/src/pkgdefs/common_files/i.devpolicy b/usr/src/pkgdefs/common_files/i.devpolicy
index cdba4b66ae..49a2d25162 100644
--- a/usr/src/pkgdefs/common_files/i.devpolicy
+++ b/usr/src/pkgdefs/common_files/i.devpolicy
@@ -20,9 +20,7 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #  NOTE:  When a change is made to the source file for
@@ -52,34 +50,34 @@ do
 	rm -f $dest.$$
 
 	# potential additions
-	additions="aggr aggr:ctl bge dld:ctl dnet keysock ibd icmp icmp6 ipsecah ipsecesp openeepr random spdsock vni ipf pfil scsi_vhci"
+	additions="aggr bge dnet keysock ibd icmp icmp6 ipsecah ipsecesp openeepr random spdsock vni ipf pfil scsi_vhci"
 
 	for dev in $additions
 	do
 		# if an entry for this driver exists in the source
 		# file...
-		grep "$dev[ 	]" $src > /dev/null 2>&1
+		grep "^$dev[ 	]" $src > /dev/null 2>&1
 		if [ $? = 0 ] ; then
 			# ...and no entry exists in the destination
 			# file...
-			grep "$dev[ 	]" $dest > /dev/null 2>&1
+			grep "^$dev[ 	]" $dest > /dev/null 2>&1
 			if [ $? != 0 ] ; then
 				# ...then add the entry from
 				# the source file to the
 				# destination file.
-				grep "$dev[ 	]" $src >> $dest
+				grep "^$dev[ 	]" $src >> $dest
 			fi
 		fi
 	done
 
 	# potential deletions
-	deletions="elx dld le"
+	deletions="elx dld dld:ctl aggr:ctl vnic:ctl le"
 
 	for dev in $deletions
 	do
 		# if an entry for this driver exists in the destination
 		# file...
-		grep "$dev[ 	]" $dest > /dev/null 2>&1
+		grep "^$dev[ 	]" $dest > /dev/null 2>&1
 		if [ $? = 0 ] ; then
 			# ...and no entry exists in the source
 			# file...
@@ -88,7 +86,7 @@ do
 				# ...then remove the entry from
 				# the destination file.
 				cp $dest $dest.$$
-				grep -v "$dev[ 	]" $dest.$$ > $dest
+				grep -v "^$dev[ 	]" $dest.$$ > $dest
 				rm -f $dest.$$
 			fi
 		fi
diff --git a/usr/src/pkgdefs/etc/exception_list_i386 b/usr/src/pkgdefs/etc/exception_list_i386
index db64100062..222064ce14 100644
--- a/usr/src/pkgdefs/etc/exception_list_i386
+++ b/usr/src/pkgdefs/etc/exception_list_i386
@@ -84,6 +84,7 @@ usr/include/sys/aggr.h			i386
 usr/include/sys/aggr_impl.h		i386
 usr/include/sys/dld.h			i386
 usr/include/sys/dld_impl.h		i386
+usr/include/sys/dld_ioc.h		i386
 usr/include/sys/dls.h			i386
 usr/include/sys/dls_impl.h		i386
 usr/include/sys/mac.h			i386
diff --git a/usr/src/pkgdefs/etc/exception_list_sparc b/usr/src/pkgdefs/etc/exception_list_sparc
index cc902429c5..55a8cfa2ac 100644
--- a/usr/src/pkgdefs/etc/exception_list_sparc
+++ b/usr/src/pkgdefs/etc/exception_list_sparc
@@ -73,6 +73,7 @@ usr/include/sys/aggr.h			sparc
 usr/include/sys/aggr_impl.h		sparc
 usr/include/sys/dld.h			sparc
 usr/include/sys/dld_impl.h		sparc
+usr/include/sys/dld_ioc.h		sparc
 usr/include/sys/dls.h			sparc
 usr/include/sys/dls_impl.h		sparc
 usr/include/sys/mac.h			sparc