changeset 10688:d09279551f94

6785837 user "xvm" should be in the default ftpusers file
author John Levon <john.levon@sun.com>
date Tue, 29 Sep 2009 18:46:22 -0700
parents 8eef07f44534
children a067a728d369
files usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers usr/src/pkgdefs/common_files/i.ftpusers
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers	Tue Sep 29 14:49:43 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers	Tue Sep 29 18:46:22 2009 -0700
@@ -13,6 +13,7 @@
 smmsp
 listen
 gdm
+xvm
 mysql
 openldap
 webservd
--- a/usr/src/pkgdefs/common_files/i.ftpusers	Tue Sep 29 14:49:43 2009 -0400
+++ b/usr/src/pkgdefs/common_files/i.ftpusers	Tue Sep 29 18:46:22 2009 -0700
@@ -19,7 +19,7 @@
 #
 # 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.
 #
 # This is similar to i.preserve, except we also check if there is a file with
@@ -59,7 +59,7 @@
 			fi
 		fi
 	fi
-	for user in dladm smmsp gdm webservd mysql openldap
+	for user in dladm smmsp gdm webservd mysql openldap xvm
 	do
 		egrep "^$user$|^#[ 	]*$user$" $dest >/dev/null 2>&1 || \
 			echo $user >> $dest