1 |
diff -Nur smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin smeserver-shared-folders-0.3_veto/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin |
2 |
--- smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2013-11-11 20:18:26.000000000 +0100 |
3 |
+++ smeserver-shared-folders-0.3_veto/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2015-12-18 12:11:53.203273973 +0100 |
4 |
@@ -1,7 +1,9 @@ |
5 |
{ |
6 |
my $recycle = $share->prop('RecycleBinDir') || "Recycle Bin"; |
7 |
+ my $veto = $share->prop('VetoFiles') || $smb{'VetoFiles'} || ''; |
8 |
if (($share->prop('RecycleBin') || 'disabled') eq 'disabled'){ |
9 |
- $OUT .= "veto files = /" . $recycle ."/\n"; |
10 |
+ $veto .= ($veto =~ m{/$}) ? '' : '/'; |
11 |
+ $veto .= "$recycle/"; |
12 |
} |
13 |
else{ |
14 |
$OUT .= ''; |
15 |
@@ -12,4 +14,5 @@ |
16 |
$share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*"; |
17 |
$share_vfs->{recycle}->{exclude_dir} = "tmp,temp,cache"; |
18 |
} |
19 |
+ $OUT .= "veto files = $veto\n" if ($veto ne ''); |
20 |
} |