mirror of
https://git.freebsd.org/ports.git
synced 2025-06-02 03:16:28 -04:00
Fix the option passed to the vfs recycle-module in smb.conf.default,
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:
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
|
@ -183,6 +183,8 @@ post-install:
|
|||
.endif
|
||||
.if defined(WITH_RECYCLE)
|
||||
${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
|
||||
${MKDIR} ${PREFIX}/share/examples/samba
|
||||
|
|
|
@ -183,7 +183,7 @@
|
|||
# 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
|
||||
; 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
|
||||
; [netlogon]
|
||||
|
@ -277,7 +277,7 @@
|
|||
; printable = no
|
||||
# Un-comment the following two lines to add a recycle bin facility to a samba share
|
||||
; 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
|
||||
# users can place files there that will be owned by the specific users. In this
|
||||
|
|
|
@ -53,6 +53,7 @@ etc/codepages/unicode_map.ISO8859-7
|
|||
etc/codepages/unicode_map.ISO8859-9
|
||||
etc/codepages/unicode_map.KOI8-R
|
||||
etc/rc.d/samba.sh.sample
|
||||
%%RECYCLE%%etc/recycle.conf.default
|
||||
etc/smb.conf.default
|
||||
%%AUDIT%%lib/samba/audit.so
|
||||
%%RECYCLE%%lib/samba/recycle.so
|
||||
|
|
Loading…
Add table
Reference in a new issue