diff options
| author | Lukas Larsson <[email protected]> | 2017-03-30 10:36:30 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-03-30 10:36:30 +0200 |
| commit | 5da9e0ab5cb96f2cb37e534b2c1a55c0c2c9783c (patch) | |
| tree | 2c5149e87daeaa23500bb94918f77fe25c7e2637 /lib/erl_interface/src/connect/ei_connect.c | |
| parent | 53b483cb14c4b3b666eab63f9f09d7ac827f9a7c (diff) | |
| parent | 3fcf58b142e22adb754b312576570c904655f877 (diff) | |
| download | otp-5da9e0ab5cb96f2cb37e534b2c1a55c0c2c9783c.tar.gz otp-5da9e0ab5cb96f2cb37e534b2c1a55c0c2c9783c.tar.bz2 otp-5da9e0ab5cb96f2cb37e534b2c1a55c0c2c9783c.zip | |
Merge branch 'goeldeepak/erts/fix_inet_gethost_long/ERL-61/PR-1345/OTP-14310'
* goeldeepak/erts/fix_inet_gethost_long/ERL-61/PR-1345/OTP-14310:
This patch fixes the issue in which erlang fails to start if the hostname is 64 characters on a linux system.
Diffstat (limited to 'lib/erl_interface/src/connect/ei_connect.c')
| -rw-r--r-- | lib/erl_interface/src/connect/ei_connect.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c index c193fd804a..27b919c093 100644 --- a/lib/erl_interface/src/connect/ei_connect.c +++ b/lib/erl_interface/src/connect/ei_connect.c @@ -497,7 +497,8 @@ int ei_connect_init(ei_cnode* ec, const char* this_node_name, } #endif /* _REENTRANT */ - if (gethostname(thishostname, EI_MAXHOSTNAMELEN) == -1) { + /* gethostname requires len to be max(hostname) + 1 */ + if (gethostname(thishostname, EI_MAXHOSTNAMELEN+1) == -1) { #ifdef __WIN32__ EI_TRACE_ERR1("ei_connect_init","Failed to get host name: %d", WSAGetLastError()); @@ -613,7 +614,8 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms) hp = ei_gethostbyname_r(hostname,&host,buffer,1024,&ei_h_errno); if (hp == NULL) { char thishostname[EI_MAXHOSTNAMELEN+1]; - if (gethostname(thishostname,EI_MAXHOSTNAMELEN) < 0) { + /* gethostname requies len to be max(hostname) + 1*/ + if (gethostname(thishostname,EI_MAXHOSTNAMELEN+1) < 0) { EI_TRACE_ERR0("ei_connect_tmo", "Failed to get name of this host"); erl_errno = EHOSTUNREACH; @@ -636,7 +638,8 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms) #else /* __WIN32__ */ if ((hp = ei_gethostbyname(hostname)) == NULL) { char thishostname[EI_MAXHOSTNAMELEN+1]; - if (gethostname(thishostname,EI_MAXHOSTNAMELEN) < 0) { + /* gethostname requires len to be max(hostname) + 1 */ + if (gethostname(thishostname,EI_MAXHOSTNAMELEN+1) < 0) { EI_TRACE_ERR1("ei_connect_tmo", "Failed to get name of this host: %d", WSAGetLastError()); |