/[smecontribs]/rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders-0.3-veto_files.patch
ViewVC logotype

Annotation of /rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders-0.3-veto_files.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Fri Dec 18 11:12:48 2015 UTC (8 years, 10 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_3-9_el6_sme, smeserver-shared-folders-0_3-11_el6_sme, smeserver-shared-folders-0_3-8_el6_sme, smeserver-shared-folders-0_3-10_el6_sme, HEAD 
* Fri Dec 18 2015 Daniel Berteaud <daniel@firewall-services.com> 0.3-8.sme
- Apply locale 2015-12-18 patch
- Add veto files directive support
1 vip-ire 1.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     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed