Changeset 23271


Ignore:
Timestamp:
2010-10-06T15:14:00+02:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r22487, r22490, r22528, r22592 and r23270

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

Legend:

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

    r22269 r23271  
    1010PKG_NAME:=dnsmasq 
    1111PKG_VERSION:=2.55 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=5 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • branches/backfire/package/dnsmasq/files/dhcp.conf

    r22223 r23271  
    55        option localise_queries 1 
    66        option rebind_protection 1  # disable if upstream must serve RFC1918 addresses 
    7         option rebind_localhost 0  # enable for RBL checking and similar services 
     7        option rebind_localhost 1  # enable for RBL checking and similar services 
    88        #list rebind_domain example.lan  # whitelist RFC1918 responses for domains 
    99        option local    '/lan/' 
     
    1919        #list interface         br-lan 
    2020        #list notinterface      lo 
     21        #list bogusnxdomain     '64.94.110.11' 
    2122 
    2223config dhcp lan 
  • branches/backfire/package/dnsmasq/files/dnsmasq.init

    r22269 r23271  
    4343 
    4444append_interface() { 
    45         append args "-i $1" 
     45        local ifname=$(uci_get_state network "$1" ifname "$1") 
     46        append args "-i $ifname" 
    4647} 
    4748 
    4849append_notinterface() { 
    49         append args "-I $1" 
     50        local ifname=$(uci_get_state network "$1" ifname "$1") 
     51        append args "-I $ifname" 
    5052} 
    5153 
    5254append_addnhosts() { 
    5355        append args "-H $1" 
     56} 
     57 
     58append_bogusnxdomain() { 
     59       append args "-B $1" 
    5460} 
    5561 
     
    7379        append_bool "$cfg" nonwildcard "-z" 
    7480 
     81        append_parm "$cfg" cachesize "-c" 
    7582        append_parm "$cfg" dnsforwardmax "-0" 
    7683        append_parm "$cfg" port "-p" 
     
    8491        config_list_foreach "$cfg" "notinterface" append_notinterface 
    8592        config_list_foreach "$cfg" "addnhosts" append_addnhosts 
     93        config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain 
    8694        append_parm "$cfg" "leasefile" "-l" 
    8795        append_parm "$cfg" "resolvfile" "-r" 
     
    95103 
    96104        config_get leasefile $cfg leasefile 
    97         [ -e "$leasefile" ] || touch "$leasefile" 
     105        [ -n "$leasefile" ] && ([ -e "$leasefile" ] || touch "$leasefile") 
    98106        config_get_bool cachelocal "$cfg" cachelocal 1 
    99107 
Note: See TracChangeset for help on using the changeset viewer.