diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin --- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2011-12-15 13:46:50.000000000 +0100 +++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2011-12-15 15:26:47.000000000 +0100 @@ -1,11 +1,15 @@ { - $OUT = ""; - return if (($share->prop('RecycleBin') || 'disabled') eq 'disabled'); - - $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ? "True" : "False"; - $share_vfs->{recycle}->{repository} = ($share->prop('RecycleBinDir') || "Recycle Bin"); - $share_vfs->{recycle}->{keeptree} = "True"; - $share_vfs->{recycle}->{touch} = "True"; - $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*"; - $share_vfs->{recycle}->{exclude_dir} = "tmp,temp,cache"; + my $recycle = $share->prop('RecycleBinDir') || "Recycle Bin"; + if (($share->prop('RecycleBin') || 'disabled') eq 'disabled'){ + $OUT .= "veto files = /" . $recycle ."/\n"; + } + else{ + $OUT .= ''; + $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ? "True" : "False"; + $share_vfs->{recycle}->{repository} = $recycle; + $share_vfs->{recycle}->{keeptree} = "True"; + $share_vfs->{recycle}->{touch} = "True"; + $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*"; + $share_vfs->{recycle}->{exclude_dir} = "tmp,temp,cache"; + } }