diff options
| author | John Levon <john.levon@sun.com> | 2009-09-29 18:46:22 -0700 |
|---|---|---|
| committer | John Levon <john.levon@sun.com> | 2009-09-29 18:46:22 -0700 |
| commit | ce08ae0aff31fd1d605cfb9abbb05228f507e240 (patch) | |
| tree | 00475e8c9e0fb927751b22f8ac3eac64eb1f29ad /usr | |
| parent | 4466400188e2b3a0fa0e310d049f282862508982 (diff) | |
| download | illumos-joyent-ce08ae0aff31fd1d605cfb9abbb05228f507e240.tar.gz | |
6785837 user "xvm" should be in the default ftpusers file
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers | 1 | ||||
| -rw-r--r-- | usr/src/pkgdefs/common_files/i.ftpusers | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers index 3a647cd938..d66be91de2 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/ftpusers @@ -13,6 +13,7 @@ dladm smmsp listen gdm +xvm mysql openldap webservd diff --git a/usr/src/pkgdefs/common_files/i.ftpusers b/usr/src/pkgdefs/common_files/i.ftpusers index 24fe948aef..c164b77657 100644 --- a/usr/src/pkgdefs/common_files/i.ftpusers +++ b/usr/src/pkgdefs/common_files/i.ftpusers @@ -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 @@ while read src dest; do 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 |