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

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

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


Revision 1.1 - (show annotations) (download)
Thu Oct 11 08:29:34 2012 UTC (12 years, 1 month ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-79_el4_sme, smeserver-shared-folders-0_1-77_el4_sme, smeserver-shared-folders-0_1-78_el4_sme, smeserver-shared-folders-0_1-76_el4_sme, HEAD
Error occurred while calculating annotation data.
* Thu Oct 11 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1-76.sme
- Look at users ACL for encrypted shares list
- Apply locale 2012-10-11 patch

1 diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm
2 --- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2012-10-11 10:11:38.677576616 +0200
3 +++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2012-10-11 10:12:47.802118276 +0200
4 @@ -46,6 +46,7 @@
5
6 foreach (@shares){
7 my @sharegroups = split(/[,;]/, ($_->prop('WriteGroups') || '') .','. ($_->prop('ReadGroups') || ''));
8 + my @shareusers = split(/[,;]/, ($_->prop('WriteUsers') || '') .','. ($_->prop('ReadUsers') || ''));
9 @sharegroups = keys %{{ map { $_ => 1 } @sharegroups }};
10
11 my %count = ();
12 @@ -58,7 +59,7 @@
13 # Only display the share in the list if encryption is enabled
14 # and the user has at least read access
15 if ((($_->prop('Encryption') || 'disabled') eq 'enabled') &&
16 - ((scalar @intersection > 0 ) || $user eq 'admin')){
17 + ((scalar @intersection > 0 ) || (grep { $_ eq $user} @shareusers) || ($user eq 'admin'))){
18 push @encfs, $_;
19 }
20 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed