smeserver-ocsinventory/contribs7/smeserver-ocsinventory-0.1-inventory_access.patch

--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs.inventory_access      2009-06-18 20:25:10.000000000 +0200
+++ smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs       2009-06-18 20:29:57.000000000 +0200
@@ -16,7 +16,13 @@
   AllowOverride None
   order deny,allow
   deny from all
-  allow from { $localAccess }
+  { 
+    my $ocsia = $ocs{'InventoryAccess'} || "local";
+    if ($ocsia eq "local")
+      { $OUT .= "  allow from $localAccess $externalSSLAccess"; }
+    else
+      { $OUT .= "  allow from all"; }
+  }
   php_admin_value open_basedir /var/lib/ocsinventory-reports/download:/tmp
 </Directory>
 
@@ -297,14 +303,14 @@
   # Be careful, do not create such directory into your web server root document !
 <Location /ocsinventory>
   order deny,allow
-{
+  deny from all
+  {
     my $ocsia = $ocs{'InventoryAccess'} || "local";
     if ($ocsia eq "local")
       { $OUT .= "  allow from $localAccess"; }
     else
       { $OUT .= "  allow from all"; }
-}
-  Satisfy Any
+  }
   SetHandler perl-script
   PerlHandler Apache::Ocsinventory
 </Location>
@@ -314,14 +320,14 @@
   SetHandler perl-script
   perlHandler "Apache::Ocsinventory::SOAP"
   order deny,allow
-{
+  deny from all
+  {
     my $ocsia = $ocs{'InventoryAccess'} || "local";
     if ($ocsia eq "local")
       { $OUT .= "  allow from $localAccess"; }
     else
       { $OUT .= "  allow from all"; }
-}
-  Satisfy any
+  }
 </location>
 </IfModule>
 
1	--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs.inventory_access 2009-06-18 20:25:10.000000000 +0200
2	+++ smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2009-06-18 20:29:57.000000000 +0200
3	@@ -16,7 +16,13 @@
4	AllowOverride None
5	order deny,allow
6	deny from all
7	- allow from { $localAccess }
8	+ {
9	+ my $ocsia = $ocs{'InventoryAccess'} \|\| "local";
10	+ if ($ocsia eq "local")
11	+ { $OUT .= " allow from $localAccess $externalSSLAccess"; }
12	+ else
13	+ { $OUT .= " allow from all"; }
14	+ }
15	php_admin_value open_basedir /var/lib/ocsinventory-reports/download:/tmp
16	</Directory>
17
18	@@ -297,14 +303,14 @@
19	# Be careful, do not create such directory into your web server root document !
20	<Location /ocsinventory>
21	order deny,allow
22	-{
23	+ deny from all
24	+ {
25	my $ocsia = $ocs{'InventoryAccess'} \|\| "local";
26	if ($ocsia eq "local")
27	{ $OUT .= " allow from $localAccess"; }
28	else
29	{ $OUT .= " allow from all"; }
30	-}
31	- Satisfy Any
32	+ }
33	SetHandler perl-script
34	PerlHandler Apache::Ocsinventory
35	</Location>
36	@@ -314,14 +320,14 @@
37	SetHandler perl-script
38	perlHandler "Apache::Ocsinventory::SOAP"
39	order deny,allow
40	-{
41	+ deny from all
42	+ {
43	my $ocsia = $ocs{'InventoryAccess'} \|\| "local";
44	if ($ocsia eq "local")
45	{ $OUT .= " allow from $localAccess"; }
46	else
47	{ $OUT .= " allow from all"; }
48	-}
49	- Satisfy any
50	+ }
51	</location>
52	</IfModule>
53