/[smecontribs]/rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-enhance_recylce_bin.patch
ViewVC logotype

Contents of /rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-enhance_recylce_bin.patch

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

Revision 1.1 - (show annotations) (download)
Fri Nov 26 09:56:37 2010 UTC (13 years, 11 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-28_el4_sme, smeserver-shared-folders-0_1-43_el4_sme, smeserver-shared-folders-0_1-39_el4_sme, smeserver-shared-folders-0_1-25_el4_sme, smeserver-shared-folders-0_1-40_el4_sme, smeserver-shared-folders-0_1-71_el4_sme, smeserver-shared-folders-0_1-61_el4_sme, smeserver-shared-folders-0_1-70_el4_sme, smeserver-shared-folders-0_1-66_el4_sme, smeserver-shared-folders-0_1-65_el4_sme, smeserver-shared-folders-0_1-51_el4_sme, smeserver-shared-folders-0_1-50_el4_sme, smeserver-shared-folders-0_1-59_el4_sme, smeserver-shared-folders-0_1-48_el4_sme, smeserver-shared-folders-0_1-56_el4_sme, smeserver-shared-folders-0_1-35_el4_sme, smeserver-shared-folders-0_1-37_el4_sme, smeserver-shared-folders-0_1-42_el4_sme, smeserver-shared-folders-0_1-60_el4_sme, smeserver-shared-folders-0_1-47_el4_sme, smeserver-shared-folders-0_1-77_el4_sme, smeserver-shared-folders-0_1-32_el4_sme, smeserver-shared-folders-0_1-74_el4_sme, smeserver-shared-folders-0_1-26_el4_sme, smeserver-shared-folders-0_1-78_el4_sme, smeserver-shared-folders-0_1-30_el4_sme, smeserver-shared-folders-0_1-41_el4_sme, smeserver-shared-folders-0_1-31_el4_sme, smeserver-shared-folders-0_1-34_el4_sme, smeserver-shared-folders-0_1-62_el4_sme, smeserver-shared-folders-0_1-58_el4_sme, smeserver-shared-folders-0_1-63_el4_sme, smeserver-shared-folders-0_1-75_el4_sme, smeserver-shared-folders-0_1-76_el4_sme, smeserver-shared-folders-0_1-68_el4_sme, smeserver-shared-folders-0_1-69_el4_sme, smeserver-shared-folders-0_1-57_el4_sme, smeserver-shared-folders-0_1-54_el4_sme, smeserver-shared-folders-0_1-49_el4_sme, smeserver-shared-folders-0_1-46_el4_sme, smeserver-shared-folders-0_1-33_el4_sme, smeserver-shared-folders-0_1-44_el4_sme, smeserver-shared-folders-0_1-45_el4_sme, smeserver-shared-folders-0_1-52_el4_sme, smeserver-shared-folders-0_1-29_el4_sme, smeserver-shared-folders-0_1-72_el4_sme, smeserver-shared-folders-0_1-73_el4_sme, smeserver-shared-folders-0_1-38_el4_sme, smeserver-shared-folders-0_1-64_el4_sme, smeserver-shared-folders-0_1-36_el4_sme, smeserver-shared-folders-0_1-67_el4_sme, smeserver-shared-folders-0_1-79_el4_sme, smeserver-shared-folders-0_1-55_el4_sme, smeserver-shared-folders-0_1-27_el4_sme, smeserver-shared-folders-0_1-53_el4_sme, HEAD 
* Thu Nov 25 2010 Daniel B. <daniel@firewall-services.com> 0.1-25.sme
- Fix excludes separator for samba recyle bin [SME: 6379]
- Recycle bin directory can be configured (RecycleBinDir prop)
- Create the recyle bin directory if enabled
- Fix defaults ACL on dir (fix issues with recylce bin)
1 diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify
2 --- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2010-11-26 10:38:39.000000000 +0100
3 +++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2010-11-26 10:38:09.000000000 +0100
4 @@ -57,6 +57,16 @@
5
6 }
7
8 +#------------------------------------------------------------
9 +# Create the recylce bin directory if needed
10 +#------------------------------------------------------------
11 +if (($share->prop('RecycleBin') || 'disabled' eq 'enabled') ||
12 + ($share->prop('RecycleBin') || 'disabled' eq 'keep-versions')){
13 + my $recycle = $share->prop('RecycleBinDir') || "Recycle Bin";
14 + system("/bin/mkdir", "-p",
15 + "/home/e-smith/files/shares/$shareName/files/$recycle") == 0
16 + or die "Error creating recycle bin directory";
17 +}
18
19 #------------------------------------------------------------
20 # Fix permissions on share files.
21 @@ -106,10 +116,17 @@
22 foreach my $group (@read){
23 $acl .= 'g:'.$group.':rx,';
24 }
25 + # Set the effective ACLs
26 system($setfacl,
27 '-m',
28 $acl,
29 $_);
30 + # Set the defaults ACLs
31 + system($setfacl,
32 + '-d',
33 + '-m',
34 + $acl,
35 + $_);
36 }
37 elsif (-f)
38 {
39 diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin
40 --- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2010-11-26 10:38:39.000000000 +0100
41 +++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2010-11-26 10:37:00.000000000 +0100
42 @@ -3,7 +3,7 @@
43 return if (($share->prop('RecycleBin') || 'disabled') eq 'disabled');
44
45 $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ? "True" : "False";
46 - $share_vfs->{recycle}->{repository} = "Recycle Bin";
47 + $share_vfs->{recycle}->{repository} = ($share->prop('RecycleBinDir') || "Recycle Bin");
48 $share_vfs->{recycle}->{keeptree} = "True";
49 $share_vfs->{recycle}->{touch} = "True";
50 $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed