Indent dhcpd.conf option custom(cherry picked from commit c507161d557817c1f6f0adbef9ffdbad82115ee8)
Fix #6720 DHCP options by pool
It is a little bit tricky having to generate the unique "option custom-if-n-m code ..." lines at first where n = pool index and m = item index in the items of the pool. Then make sure to reference that later, getting the same pool index into the array of pools. The $all_pools array as the "overall" or "base" pool first (at index 0), followed by the user-specified pools at index 1, 2, 3,... - which are actually at indexes 0, 1, 2,... in the ordinary array of pools in the config. So the -1 at line 910 has to happen....
Fix double domain-name-servers for pool
Add a pool and specify something in 1 or more of the DNS servers boxes for the pool.The "option domain-name-servers 1.2.3.4" line appears twice in dhcpd.confThe first bit of code to do it is at lines 787-799. I have deleted this 2nd time that it is done at lines 854-856....
Fix #6724 VLAN interface displayed wrong
in interface assignment script dialog.
The str_replace() calls were not smart enough to just get rid of bare "igb1" when "igb1_vlan123" and such like was also in the list.(cherry picked from commit fd020a2d94077cc9c8ee6bac5b3da11e116c84a2)
Use "-C /dev/null" when starting dnsmasq to avoid it picking up an incorrect default config which would override our command line parameters. Fixes #6730
Fix DDNS domain for static map DHCP entries
If you specify DDNS Domain in a DHCP static map entry, it does not make its way through to dhcpd.confThis is because the var name $pdnscfg is wrong from an old copy-paste that first made this code.(cherry picked from commit a5a55231770e548898b6b1c18146cc0c6631c5c6)
Code style and comments
No functional change - just making style consistent
(cherry picked from commit 9d3e8723171c727cf43338bd8e95ab2bb7e6a66c)
Pass along send_smtp_message() return, otherwise message will not be shown when testing SMTP settings
Text typo
Noted by Daryl Morse in comment on Redmine bug 6637.(cherry picked from commit bf6ae0ad277710ffa64ee0967c5d4f717c2bc54b)
Verify if interface is active gw for gw group before update dynamic DNS
View revisions
Also available in: Atom