1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares |
2 |
|
|
--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2009-05-19 22:31:50.000000000 +0200 |
3 |
|
|
+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2009-05-19 22:31:16.000000000 +0200 |
4 |
|
|
@@ -47,11 +47,7 @@ |
5 |
|
|
|
6 |
|
|
if ($properties{'httpAccess'}) |
7 |
|
|
{ |
8 |
|
|
- if ($properties{'httpAccess'} eq 'none') |
9 |
|
|
- { |
10 |
|
|
- next; |
11 |
|
|
- } |
12 |
|
|
- elsif ($properties{'httpAccess'} eq 'local') |
13 |
|
|
+ if ($properties{'httpAccess'} eq 'local') |
14 |
|
|
{ |
15 |
|
|
$allow = $localAccess; |
16 |
|
|
$pass = 0; |
17 |
|
|
@@ -81,6 +77,9 @@ |
18 |
|
|
$pass = 1; |
19 |
|
|
$satisfy = 'any'; |
20 |
|
|
} |
21 |
|
|
+ else{ |
22 |
|
|
+ next; |
23 |
|
|
+ } |
24 |
|
|
} |
25 |
|
|
|
26 |
|
|
my $allowOverride = $properties{'AllowOverride'} || "None"; |