aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-01-11 17:23:08 +0100
committerPatrik Nyblom <[email protected]>2011-01-11 17:23:08 +0100
commit8b9519ccf398107c404a266687ed4b6456bef143 (patch)
tree882ce88fbca6f10637324173355555feffa83b69 /erts
parent2b021d21d7d084196560f50f392b1c4962094d99 (diff)
downloadotp-8b9519ccf398107c404a266687ed4b6456bef143.tar.gz
otp-8b9519ccf398107c404a266687ed4b6456bef143.tar.bz2
otp-8b9519ccf398107c404a266687ed4b6456bef143.zip
Remove special treatment of EADDRINUSE
Diffstat (limited to 'erts')
-rw-r--r--erts/epmd/src/epmd_srv.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 6b3900fae2..3499ab2934 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -2,7 +2,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -157,20 +157,10 @@ void run(EpmdVars *g)
dbg_printf(g,2,"starting");
- if(listen(listensock, SOMAXCONN) < 0)
- {
- if (errno == EADDRINUSE)
- {
- dbg_tty_printf(g,1,"there is already a epmd running at port %d",
- g->port);
- epmd_cleanup_exit(g,0);
- }
- else
- {
- dbg_perror(g,"failed to listen on socket");
- epmd_cleanup_exit(g,1);
- }
- }
+ if(listen(listensock, SOMAXCONN) < 0) {
+ dbg_perror(g,"failed to listen on socket");
+ epmd_cleanup_exit(g,1);
+ }
FD_ZERO(&g->orig_read_mask);
FD_SET(listensock,&g->orig_read_mask);