diff --git a/dns/bind/Makefile b/dns/bind/Makefile index 77b4de062..9e40a5906 100644 --- a/dns/bind/Makefile +++ b/dns/bind/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= bind PLUGIN_VERSION= 1.26 -PLUGIN_REVISION= 2 +PLUGIN_REVISION= 3 PLUGIN_COMMENT= BIND domain name service PLUGIN_DEPENDS= bind918 PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr index 344006191..e8edd8be2 100644 --- a/dns/bind/pkg-descr +++ b/dns/bind/pkg-descr @@ -15,6 +15,7 @@ Plugin Changelog * Allow multiple ACLs to be selected for Transfers/Queries (contributed by Robbert Rijkse) * Rename Master/Slave to Primary/Secondary (contributed by Robbert Rijkse) * Add necessary hooks to allow the plugin to be used as a standalone core DNS server +* Changed default listening addresses to 0.0.0.0/:: for new users 1.25 diff --git a/dns/bind/src/etc/inc/plugins.inc.d/bind.inc b/dns/bind/src/etc/inc/plugins.inc.d/bind.inc index 8e6a1d4d8..627e10808 100644 --- a/dns/bind/src/etc/inc/plugins.inc.d/bind.inc +++ b/dns/bind/src/etc/inc/plugins.inc.d/bind.inc @@ -2,6 +2,7 @@ /* * Copyright (C) 2018 Michael Muenz + * Copyright (C) 2023 Franco Fichtner * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,21 +50,21 @@ function bind_services() $model = new \OPNsense\Bind\General(); - /* DNS service is eligable for core use when both 127.0.0.1 and ::1 are set */ - $localhost4 = false; - $localhost6 = false; + /* DNS service is eligable for core use when both 0.0.0.0 and :: are set */ + $any4 = false; + $any6 = false; foreach (explode(',', (string)$model->listenv4) as $addr) { - $localhost4 |= $addr === '127.0.0.1'; + $any4 |= $addr === '0.0.0.0'; } foreach (explode(',', (string)$model->listenv6) as $addr) { - $localhost6 |= $addr === '::1'; + $any6 |= $addr === '::'; } $services[] = [ /* the port may still be something other than 53, but it's safe to register a conflict for it */ - 'dns_ports' => ($localhost4 && $localhost6 ? [(string)$model->port] : []), + 'dns_ports' => ($any4 && $any6 ? [(string)$model->port] : []), 'description' => gettext('BIND Daemon'), 'configd' => [ 'restart' => ['bind restart'], diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml index d7232ca2c..35e193df3 100644 --- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml +++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml @@ -16,13 +16,13 @@ Y - 127.0.0.1 + 0.0.0.0 , Y Y - ::1 + :: , Y Y @@ -149,7 +149,7 @@ Choose a value between 1 and 1000. - 127.0.0.1,::1 + 0.0.0.0,:: , Y Y