Changeset 22223


Ignore:
Timestamp:
2010-07-16T03:00:16+02:00 (7 years ago)
Author:
jow
Message:

[backfire] merge r21523, r21871 & r22222

Location:
branches/backfire/package/dnsmasq
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/dnsmasq/Makefile

    r21110 r22223  
    99 
    1010PKG_NAME:=dnsmasq 
    11 PKG_VERSION:=2.52 
    12 PKG_RELEASE:=4 
     11PKG_VERSION:=2.55 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq 
    16 PKG_MD5SUM:=1bb32fffdb4f977ead607802b5d701d0 
     16PKG_MD5SUM:=b093d7c6bc7f97ae6fd35d048529232a 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
  • branches/backfire/package/dnsmasq/files/dhcp.conf

    r17599 r22223  
    22        option domainneeded     1 
    33        option boguspriv        1 
    4         option filterwin2k      '0'  #enable for dial on demand 
     4        option filterwin2k      0  # enable for dial on demand 
    55        option localise_queries 1 
     6        option rebind_protection 1  # disable if upstream must serve RFC1918 addresses 
     7        option rebind_localhost 0  # enable for RBL checking and similar services 
     8        #list rebind_domain example.lan  # whitelist RFC1918 responses for domains 
    69        option local    '/lan/' 
    710        option domain   'lan' 
  • branches/backfire/package/dnsmasq/files/dnsmasq.init

    r21110 r22223  
    100100        config_get hostsfile "$cfg" dhcphostsfile 
    101101        [ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile" 
     102 
     103        local rebind 
     104        config_get_bool rebind "$cfg" rebind_protection 1 
     105        [ $rebind -gt 0 ] && { 
     106                logger -t dnsmasq \ 
     107                        "DNS rebinding protection is active," \ 
     108                        "will discard upstream RFC1918 responses!" 
     109                append args "--stop-dns-rebind" 
     110 
     111                local rebind_localhost 
     112                config_get_bool rebind_localhost "$cfg" rebind_localhost 0 
     113                [ $rebind_localhost -gt 0 ] && { 
     114                        logger -t dnsmasq "Allowing 127.0.0.0/8 responses" 
     115                        append args "--rebind-localhost-ok" 
     116                } 
     117 
     118                append_rebind_domain() { 
     119                        logger -t dnsmasq "Allowing RFC1918 responses for domain $1" 
     120                        append args "--rebind-domain-ok=$1" 
     121                } 
     122 
     123                config_list_foreach "$cfg" rebind_domain append_rebind_domain 
     124        } 
    102125} 
    103126 
Note: See TracChangeset for help on using the changeset viewer.