diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-03-05 16:03:34 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-03-05 16:03:34 +0000 |
| commit | ce07beb68ea29bcb6b3c07d578eaa026aa99efe1 (patch) | |
| tree | bb83dbc8c5c15d129ae105936692434dce02e118 /net | |
| parent | Do not use IGNOREFILES. (diff) | |
When converting /etc/passwd, skip comments ($FreeBSD$ line).
Previously, they would end up in private/smbpasswd after being parsed as
users.
Notes
Notes:
svn path=/head/; revision=39102
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 2 | ||||
| -rw-r--r-- | net/samba/pkg-plist | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index d2d4aebe501e..8732a1a0cd6d 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -70,7 +70,7 @@ post-install: fi ${CHMOD} 700 ${SAMBA_PRIVATE} if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then \ - ${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \ + ${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \ ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd ; \ fi ${CHMOD} 500 ${SAMBA_PRIVATE} diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist index 56feadef0d63..30696e5e6baf 100644 --- a/net/samba/pkg-plist +++ b/net/samba/pkg-plist @@ -434,7 +434,7 @@ share/swat/using_samba/gifs/txtpreva.gif @dirrm share/swat/using_samba/gifs @dirrm share/swat/using_samba @dirrm share/swat -@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ; cat /etc/passwd | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi +@exec mkdir %D/private ; if [ ! -f %D/private/smbpasswd ] ; then chown -R root.wheel %D/private ; cat /etc/passwd | grep -v "^#" | %D/bin/make_smbpasswd > %D/private/smbpasswd ; chmod 500 %D/private ; chmod 600 %D/private/smbpasswd ; fi @exec mkdir -p /var/spool/samba ; chmod 1777 /var/spool/samba @exec cat %D/share/doc/samba/README.FreeBSD @unexec rm -rf /var/spool/samba |