/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-sudo_env.patch
ViewVC logotype

Contents of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-sudo_env.patch

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

Revision 1.1 - (show annotations) (download)
Tue Jul 20 13:43:28 2010 UTC (14 years, 3 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-20_el4_sme, smeserver-coova-chilli-0_2-17_el4_sme, smeserver-coova-chilli-0_2-18_el4_sme, smeserver-coova-chilli-0_2-19_el4_sme, HEAD 
* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17
- Fixes sudo env (bug only in SME8)
- Uses TCPPort squid key instead of TransparentPort so coova can
  work with dansguardian
- insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI)
- add transparent directive to squid (required for squid => 2.6)
1 --- smeserver-coova-chilli-0.2/root/etc/chilli/call_condown.sh.sudo_env 2010-07-19 17:37:16.000000000 +0200
2 +++ smeserver-coova-chilli-0.2/root/etc/chilli/call_condown.sh 2010-07-19 17:41:15.000000000 +0200
3 @@ -1,5 +1,5 @@
4 #!/bin/bash
5
6 -exec /usr/bin/sudo /etc/chilli/condown.sh
7 +exec /usr/bin/sudo /etc/chilli/condown.sh $ADDR $FRAMED_IP_ADDRESS
8
9
10 --- smeserver-coova-chilli-0.2/root/etc/chilli/condown.sh.sudo_env 2010-07-19 17:37:16.000000000 +0200
11 +++ smeserver-coova-chilli-0.2/root/etc/chilli/condown.sh 2010-07-19 17:41:34.000000000 +0200
12 @@ -5,9 +5,9 @@
13
14 if [[ $SQUID_STATUS == 'enabled' && $WEB_REQ == 'squid' ]]; then
15 SQUID_PORT=$(/sbin/e-smith/db configuration getprop squid TransparentPort)
16 - /sbin/iptables -D IN_FROM_CHILLI -s $FRAMED_IP_ADDRESS \
17 + /sbin/iptables -D IN_FROM_CHILLI -s $2 \
18 -p tcp --dport $SQUID_PORT --syn -j ACCEPT
19 - /sbin/iptables -t nat -D PREROUTING_FROM_CHILLI -s $FRAMED_IP_ADDRESS \
20 - -p tcp --dport 80 -j DNAT --to $ADDR:$SQUID_PORT
21 + /sbin/iptables -t nat -D PREROUTING_FROM_CHILLI -s $2 \
22 + -p tcp --dport 80 -j DNAT --to $1:$SQUID_PORT
23 fi
24
25 --- smeserver-coova-chilli-0.2/root/etc/chilli/conup.sh.sudo_env 2010-07-19 17:37:16.000000000 +0200
26 +++ smeserver-coova-chilli-0.2/root/etc/chilli/conup.sh 2010-07-19 17:40:47.000000000 +0200
27 @@ -5,9 +5,9 @@
28
29 if [[ $SQUID_STATUS == 'enabled' && $WEB_REQ == 'squid' ]]; then
30 SQUID_PORT=$(/sbin/e-smith/db configuration getprop squid TransparentPort)
31 - /sbin/iptables -t nat -I PREROUTING_FROM_CHILLI 4 -s $FRAMED_IP_ADDRESS \
32 - -p tcp --dport 80 -j DNAT --to $ADDR:$SQUID_PORT
33 - /sbin/iptables -I IN_FROM_CHILLI 7 -s $FRAMED_IP_ADDRESS \
34 + /sbin/iptables -t nat -I PREROUTING_FROM_CHILLI 4 -s $2 \
35 + -p tcp --dport 80 -j DNAT --to $1:$SQUID_PORT
36 + /sbin/iptables -I IN_FROM_CHILLI 7 -s $2 \
37 -p tcp --dport $SQUID_PORT --syn -j ACCEPT
38 fi
39
40 --- smeserver-coova-chilli-0.2/root/etc/chilli/call_conup.sh.sudo_env 2010-07-19 17:37:16.000000000 +0200
41 +++ smeserver-coova-chilli-0.2/root/etc/chilli/call_conup.sh 2010-07-19 17:39:25.000000000 +0200
42 @@ -1,4 +1,4 @@
43 #!/bin/bash
44
45 -exec /usr/bin/sudo /etc/chilli/conup.sh
46 +exec /usr/bin/sudo /etc/chilli/conup.sh $ADDR $FRAMED_IP_ADDRESS
47
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed