diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-04-15 17:26:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-15 17:26:21 +0000 |
| commit | 10f222d49cb0855abcfbfd527cd9e4170b71444d (patch) | |
| tree | 30c684f9f2ee08e96d98c13b041bf427c633de21 | |
| parent | bfce4be5569c60687509a40c4f2304f2962182cb (diff) | |
| parent | ed507c4c5fc7fa6058dbc74ade8d440247978f30 (diff) | |
| download | platform_external_dnsmasq-10f222d49cb0855abcfbfd527cd9e4170b71444d.tar.gz platform_external_dnsmasq-10f222d49cb0855abcfbfd527cd9e4170b71444d.tar.bz2 platform_external_dnsmasq-10f222d49cb0855abcfbfd527cd9e4170b71444d.zip | |
Merge "Don't enumerate interfaces if no interfaces were found." am: ae3d675a71 am: ed507c4c5f
Change-Id: I3186129cb55d3dde068023a4ecd4c1d58aba996f
| -rw-r--r-- | src/network.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network.c b/src/network.c index 34d821d..98b4f68 100644 --- a/src/network.c +++ b/src/network.c @@ -833,8 +833,11 @@ void set_interfaces(const char* interfaces) { * Enumerate IP addresses (via RTM_GETADDR), adding IP entries to * daemon->interfaces for interface names listed in daemon->if_names. * The sockets are created by the create_bound_listener call below. + * Only do this if at least one interface was found. Otherwise, + * enumerate_interfaces will start listening on all interfaces on + * the system. */ - if (!enumerate_interfaces()) { + if (daemon->if_names != NULL && !enumerate_interfaces()) { die(_("enumerate interfaces error in set_interfaces: %s"), NULL, EC_BADNET); } |