6791467 i.group CAS's use of ed(1) limits line length to (an unworkable) 255 characters

2 files changed, 83 insertions, 57 deletions

diff --git a/usr/src/pkgdefs/common_files/i.group b/usr/src/pkgdefs/common_files/i.group
index 6d177f46f5..a2c06217ab 100644
--- a/usr/src/pkgdefs/common_files/i.group
+++ b/usr/src/pkgdefs/common_files/i.group
@@ -19,12 +19,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 PATH="/usr/bin:/usr/sbin:${PATH}"
-export PATH
+export PATH	
+	
+TEMPF="/tmp/g.$$"
 
 while read src dest
 do
@@ -64,8 +66,10 @@ do
 		if grep "$NOGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^noaccess::60002:\na\n%s\n.\nw\nq\n' \
-				"$NOGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^noaccess::60002:/ a\
+'"$NOGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
+				
 		fi
 
 		# Remove redundant /etc/group entries that overlap with
@@ -100,9 +104,9 @@ do
 			/^smmsp:/s/:smmsp$/:/;
 			/^lp:/s/\([:,]\)lp,/\1/;
 			/^lp:/s/,lp$//;
-			/^lp:/s/:lp$/:/' $dest > /tmp/g.$$ && 
-		cp /tmp/g.$$ $dest
-		rm -f /tmp/g.$$
+			/^lp:/s/:lp$/:/' $dest > $TEMPF && 
+		cp $TEMPF $dest
+		rm -f $TEMPF
 
 		#add 'root' to user-list of group1
 		# line 1,2: skip any line with root in the user field
@@ -114,10 +118,10 @@ do
 			/[:,]root$/b
 			s/:1:\([^:][^:]*\)$/:1:root,\1/;
 			s/:1:$/:1:root/;
-		' $dest > /tmp/g.$$ &&
+		' $dest > $TEMPF &&
 
-		cp /tmp/g.$$ $dest
-		rm -f /tmp/g.$$
+		cp $TEMPF $dest
+		rm -f $TEMPF
 
 		#
 		# Add the 'smmsp' group for sendmail 8.12
@@ -126,8 +130,9 @@ do
 		if grep "$SMMSPGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^nogroup::65534:\na\n%s\n.\nw\nq\n' \
-				"$SMMSPGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^nogroup::65534:/ a\
+'"$SMMSPGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 		#
 		# Add the 'gdm' group if it doesn't already exist.
@@ -140,8 +145,9 @@ do
 		elif grep "$GDMGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^smmsp::25:\na\n%s\n.\nw\nq\n' \
-				"$GDMGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^smmsp::25:/ a\
+'"$GDMGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 		#
 		# Add the 'webservd' group if it doesn't already exist.
@@ -154,8 +160,9 @@ do
 		elif grep "$WEBSERVDGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^gdm::50:\na\n%s\n.\nw\nq\n' \
-				"$WEBSERVDGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^gdm::50: a\
+'"$WEBSERVDGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -173,8 +180,9 @@ do
 		elif grep "$POSTGRESGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^webservd::80:\na\n%s\n.\nw\nq\n' \
-			    "$POSTGRESGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^webservd::80:/ a\
+'"$POSTGRESGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
    	        #	
 		# Add the 'mysql' group if it doesn't already exist.
@@ -191,8 +199,9 @@ do
                 elif grep "$MYSQLGROUP_LINE" $dest 2>&1 >/dev/null; then
                         :
                 else
-                        printf '/^postgres::90:\na\n%s\n.\nw\nq\n' \
-                            "$MYSQLGROUP_LINE" | ed -s $dest > /dev/null
+                        sed '/^postgres::90:/ a\
+'"$MYSQLGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
                 fi
                 #
 		# Add the 'games' group if it doesn't already exist.
@@ -209,8 +218,9 @@ do
 		elif grep "$GAMESGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^smmsp::25:\ni\n%s\n.\nw\nq\n' \
-			"$GAMESGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^smmsp::25:/ a\
+'"$GAMESGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 		#
 		# Add the 'xvm' group if it doesn't already exist.
@@ -227,8 +237,9 @@ do
 		elif grep "$XVMGROUP_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^mysql::70:\ni\n%s\n.\nw\nq\n' \
-                            "$XVMGROUP_LINE" | ed -s $dest > /dev/null
+			sed '/^mysql::70:/ a\
+'"$XVMGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
                 #
                 # Add the 'slocate' group if it doesn't already exist.
@@ -245,8 +256,9 @@ do
                 elif grep "$SLOCATEGROUP_LINE" $dest 2>&1 >/dev/null; then
                         :
                 else
-                        printf '/^postgres::90:\na\n%s\n.\nw\nq\n' \
-                            "$SLOCATEGROUP_LINE" | ed -s $dest > /dev/null
+                        sed '/^postgres::90:/ a\
+'"$SLOCATEGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
                 fi
    	        #	
 		# Add the 'openldap' group if it doesn't already exist.
@@ -263,8 +275,9 @@ do
                 elif grep "$OPENLDAPGROUP_LINE" $dest 2>&1 >/dev/null; then
                         :
                 else
-                        printf '/^mysql::70:\na\n%s\n.\nw\nq\n' \
-                            "$OPENLDAPGROUP_LINE" | ed -s $dest > /dev/null
+                        sed '/^mysql::70:/ a\
+'"$OPENLDAPGROUP_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
                 fi
 	fi
 done
diff --git a/usr/src/pkgdefs/common_files/i.passwd b/usr/src/pkgdefs/common_files/i.passwd
index ee0fd61ba7..f99fd5a86d 100644
--- a/usr/src/pkgdefs/common_files/i.passwd
+++ b/usr/src/pkgdefs/common_files/i.passwd
@@ -19,13 +19,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 PATH="/usr/bin:/usr/sbin:${PATH}"
 export PATH
 
+TEMPF="/tmp/d.$$"
+
 while read src dest
 do
 	if [ ! -f $dest ] ; then
@@ -42,17 +44,17 @@ do
 		    -e '/^smtp:/d' \
 		    -e '/^nobody:/s/:Nobody:/:NFS Anonymous Access User:/' \
 		    -e '/^nobody4:/s/:SunOS\ 4\.x\ Nobody:/:SunOS 4.x NFS Anonymous Access User:/;' \
-		    $dest > /tmp/d.$$
-		cp /tmp/d.$$ $dest
-		rm -f /tmp/d.$$
+		    $dest > $TEMPF
+		cp $TEMPF $dest
+		rm -f $TEMPF
 
 		#
 		# s10 is changing root's group back to 0:
 		#
 		sed -e 's/^root:\([^:]*\):0:1:/root:\1:0:0:/' \
-			$dest > /tmp/d.$$
-		cp /tmp/d.$$ $dest
-		rm -f /tmp/d.$$
+			$dest > $TEMPF
+		cp $TEMPF $dest
+		rm -f $TEMPF
 
 		#
 		# Add the 'nobody' user from 4.x so that people don't
@@ -62,8 +64,9 @@ do
 		if grep "^nobody4:" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^noaccess:x\na\n%s\n.\nw\nq\n' \
-				"$NOBODY4_LINE" | ed -s $dest > /dev/null
+			sed '/^noaccess:x/ a\
+'"$NOBODY4_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -73,8 +76,9 @@ do
 		if grep "$SMMSP_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^nobody4:x\na\n%s\n.\nw\nq\n' \
-				"$SMMSP_LIN" | ed -s $dest > /dev/null
+			sed '/^nobody4:x/ a\
+'"$SMMSP_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 		
 		#
@@ -88,8 +92,9 @@ do
 		elif grep "$GDM_LINE" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^listen:x\na\n%s\n.\nw\nq\n' \
-				"$GDM_LINE" | ed -s $dest > /dev/null
+			sed '/^listen:x/ a\
+'"$GDM_LINE"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -103,8 +108,9 @@ do
 		elif grep "$WEBSERVD_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^gdm:x\na\n%s\n.\nw\nq\n' \
-				"$WEBSERVD_LIN" | ed -s $dest > /dev/null
+			sed '/^gdm:x/ a\
+'"$WEBSERVD_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -122,8 +128,9 @@ do
 		elif grep "$POSTGRES_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^webservd:x\na\n%s\n.\nw\nq\n' \
-			    "$POSTGRES_LIN" | ed -s $dest > /dev/null
+			sed '/^webservd:x/ a\
+'"$POSTGRES_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
                 #
@@ -141,8 +148,9 @@ do
                 elif grep "$MYSQL_LIN" $dest 2>&1 >/dev/null; then
                         :
                 else
-                        printf '/^postgres:x\na\n%s\n.\nw\nq\n' \
-                            "$MYSQL_LIN" | ed -s $dest > /dev/null
+                        sed '/^postgres:x/ a\
+'"$MYSQL_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
                 fi
 
 		#
@@ -160,8 +168,9 @@ do
 		elif grep "$SVCTAG_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^postgres:x\na\n%s\n.\nw\nq\n' \
-			    "$SVCTAG_LIN" | ed -s $dest > /dev/null
+			sed '/^postgres:x/ a\
+'"$SVCTAG_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -175,8 +184,9 @@ do
 		elif grep "$DLADM_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^nuucp:x\na\n%s\n.\nw\nq\n' \
-				"$DLADM_LIN" | ed -s $dest > /dev/null
+			sed '/^nuucp:x/ a\
+'"$DLADM_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -194,8 +204,9 @@ do
 		elif grep "$XVM_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^gdm:x\na\n%s\n.\nw\nq\n' \
-			    "$XVM_LIN" | ed -s $dest > /dev/null
+			sed '/^gdm:x/ a\
+'"$XVM_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 		#
 		# Add the 'openldap' user if it doesn't exist.
@@ -212,8 +223,9 @@ do
 		elif grep "$OPENLDAP_LIN" $dest 2>&1 >/dev/null; then
 			:
 		else
-			printf '/^mysql:x\na\n%s\n.\nw\nq\n' \
-			    "$OPENLDAP_LIN" | ed -s $dest > /dev/null
+			sed '/^mysql:x/ a\
+'"$OPENLDAP_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 
 		#
@@ -231,8 +243,9 @@ do
 		elif grep "$ZSNAP_LIN" $dest 2>&1 > /dev/null; then
 			:
 		else
-			printf '/^gdm:x\na\n%s\n.\nw\nq\n' \
-			    "$ZSNAP_LIN" | ed -s $dest > /dev/null
+			sed '/^gdm:x/ a\
+'"$ZSNAP_LIN"'' $dest > $TEMPF
+			mv -f $TEMPF $dest
 		fi
 	fi
 done