From d9486504180f5ec438f7bcb871e20c5666dd1672 Mon Sep 17 00:00:00 2001
From: netchild <netchild@FreeBSD.org>
Date: Fri, 7 Feb 2003 15:17:56 +0000
Subject: 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
---
 net/samba/Makefile               | 2 ++
 net/samba/files/smb.conf.default | 4 ++--
 net/samba/pkg-plist              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'net')

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4e9c99bae40d..1cf4b8f92576 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -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
diff --git a/net/samba/files/smb.conf.default b/net/samba/files/smb.conf.default
index d1730f32c249..7a374a341ff9 100644
--- a/net/samba/files/smb.conf.default
+++ b/net/samba/files/smb.conf.default
@@ -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
diff --git a/net/samba/pkg-plist b/net/samba/pkg-plist
index f03fe0ed64a6..1e1858a4e2a1 100644
--- a/net/samba/pkg-plist
+++ b/net/samba/pkg-plist
@@ -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
-- 
cgit