sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the option passed to the vfs recycle-module in smb.conf.default,

Browse source 
it now takes a config file rather than directly specifying the desired
options. Install a sample recycle.conf.default in LOCALBASE/etc.

Submitted by:	marius@alchemy.franken.de
Approved by:	maintainer
This commit is contained in:
Alexander Leidinger 2003-02-07 15:17:56 +00:00
parent b2b0cd617a
commit 26f7ecb9e9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=75027
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/samba/Makefile
View file

@ -183,6 +183,8 @@ post-install:
.endif .endif
.if defined(WITH_RECYCLE) .if defined(WITH_RECYCLE)
${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.so ${SAMBA_VFSDIR} ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.so ${SAMBA_VFSDIR}
@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.conf \
${SAMBA_CONFDIR}/recycle.conf.default
.endif .endif
.endif .endif
${MKDIR} ${PREFIX}/share/examples/samba ${MKDIR} ${PREFIX}/share/examples/samba

4
net/samba/files/smb.conf.default
View file

@ -183,7 +183,7 @@
# Un-comment the following two lines to add a recycle bin facility to a samba share # Un-comment the following two lines to add a recycle bin facility to a samba share
# NOTE: It currently doesn't work with the [homes] virtual share, use a regular share instead # NOTE: It currently doesn't work with the [homes] virtual share, use a regular share instead
; vfs object = %%SAMBA_VFSDIR%%/recycle.so ; vfs object = %%SAMBA_VFSDIR%%/recycle.so
; vfs options= recycle=.recycle ; vfs options= %%SAMBA_CONFDIR%%/recycle.conf.default
# Un-comment the following and create the netlogon directory for Domain Logons # Un-comment the following and create the netlogon directory for Domain Logons
; [netlogon] ; [netlogon]
@ -277,7 +277,7 @@
; printable = no ; printable = no
# Un-comment the following two lines to add a recycle bin facility to a samba share # Un-comment the following two lines to add a recycle bin facility to a samba share
; vfs object = %%SAMBA_VFSDIR%%/recycle.so ; vfs object = %%SAMBA_VFSDIR%%/recycle.so
; vfs options= recycle=.recycle ; vfs options= %%SAMBA_CONFDIR%%/recycle.conf.default
# The following two entries demonstrate how to share a directory so that two # The following two entries demonstrate how to share a directory so that two
# users can place files there that will be owned by the specific users. In this # users can place files there that will be owned by the specific users. In this

1
net/samba/pkg-plist
View file

@ -53,6 +53,7 @@ etc/codepages/unicode_map.ISO8859-7
etc/codepages/unicode_map.ISO8859-9 etc/codepages/unicode_map.ISO8859-9
etc/codepages/unicode_map.KOI8-R etc/codepages/unicode_map.KOI8-R
etc/rc.d/samba.sh.sample etc/rc.d/samba.sh.sample
%%RECYCLE%%etc/recycle.conf.default
etc/smb.conf.default etc/smb.conf.default
%%AUDIT%%lib/samba/audit.so %%AUDIT%%lib/samba/audit.so
%%RECYCLE%%lib/samba/recycle.so %%RECYCLE%%lib/samba/recycle.so