aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-08 16:28:52 +0200
committerHenrik Nord <[email protected]>2011-09-08 16:28:58 +0200
commit23942cb1e5d919799f989286b0285ff7de584796 (patch)
treee361e40334875e163f3507066c14e6ab145e70df /erts/epmd/src
parenta192de2308734a5b2cdb4adc859bdb65da6dfb3e (diff)
parent32228c665506b1d84e0758c81fcb9ff3d8f8bef4 (diff)
downloadotp-23942cb1e5d919799f989286b0285ff7de584796.tar.gz
otp-23942cb1e5d919799f989286b0285ff7de584796.tar.bz2
otp-23942cb1e5d919799f989286b0285ff7de584796.zip
Merge branch 'hw/ignore-empty-epmd-address' into dev
* hw/ignore-empty-epmd-address: Let epmd ignore empty ERL_EPMD_ADDRESS OTP-9525
Diffstat (limited to 'erts/epmd/src')
-rw-r--r--erts/epmd/src/epmd_srv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 5debae26b6..da575affa1 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -102,7 +102,8 @@ void run(EpmdVars *g)
dbg_printf(g,2,"try to initiate listening port %d", g->port);
- if (g->addresses != NULL)
+ if (g->addresses != NULL && /* String contains non-separator characters if: */
+ g->addresses[strspn(g->addresses," ,")] != '\000')
{
char *tmp;
char *token;