From 3a7c33ee0ed5afa75fb1c50a3b81cfe2e14c6c64 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 18 Apr 2012 14:13:34 +0200 Subject: [PATCH] Only update homedir ACL if required --- root/etc/e-smith/events/actions/ajaxplorer-user-rights | 6 ++++++ smeserver-ajaxplorer.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/root/etc/e-smith/events/actions/ajaxplorer-user-rights b/root/etc/e-smith/events/actions/ajaxplorer-user-rights index 14643ea..fc678c6 100644 --- a/root/etc/e-smith/events/actions/ajaxplorer-user-rights +++ b/root/etc/e-smith/events/actions/ajaxplorer-user-rights @@ -79,6 +79,9 @@ else{ sub set_user_acl{ my $user = shift; + my $acl = `/usr/bin/getfacl /home/e-smith/files/users/$user 2>/dev/null | egrep -c '^user:(apache|www):'`; + chomp($acl); + return if ($acl > 0); system('/usr/bin/setfacl', '-m', 'u:www:x', @@ -92,6 +95,9 @@ sub set_user_acl{ sub remove_user_acl{ my $user = shift; + my $acl = `/usr/bin/getfacl /home/e-smith/files/users/$user 2>/dev/null | egrep -c '^user:(apache|www):'`; + chomp($acl); + return if ($acl < 1); system('/usr/bin/setfacl', '-R', '-x', diff --git a/smeserver-ajaxplorer.spec b/smeserver-ajaxplorer.spec index 7e2fee2..c50cde7 100644 --- a/smeserver-ajaxplorer.spec +++ b/smeserver-ajaxplorer.spec @@ -2,7 +2,7 @@ # Name: Daniel Berteaud %define name smeserver-ajaxplorer -%define version 0.1.2 +%define version 0.1.3 %define release 1 Summary: sme server integration of ajaxplorer Name: %{name} @@ -29,6 +29,9 @@ Ajaxplorer is a rich-client browser for managing files on a web server This contrib works with the smeserver-shared-folders addon %changelog +* Wed Apr 18 2012 Daniel Berteaud 0.1.3-1 +- Only update homedir ACL if required + * Tue Apr 17 2012 Daniel Berteaud 0.1.2-1 - Posibility to access home dir (Read Only) - Fix ACL for rw users