diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-03-06 00:03:34 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-03-06 00:03:34 +0800 |
| commit | 2faecac65d7876a2e2310de542b6d373240b409b (patch) | |
| tree | 5526a3543ed1009cb5c1d1394c0c4c26f5f5ebfa /net | |
| parent | a4ce4c041f756b76868316647da37bd66aba4a60 (diff) | |
| download | freebsd-ports-gnome-2faecac65d7876a2e2310de542b6d373240b409b.tar.gz freebsd-ports-gnome-2faecac65d7876a2e2310de542b6d373240b409b.tar.zst freebsd-ports-gnome-2faecac65d7876a2e2310de542b6d373240b409b.zip | |
When converting /etc/passwd, skip comments ($FreeBSD$ line).
Previously, they would end up in private/smbpasswd after being parsed as
users.
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 |