aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src
diff options
context:
space:
mode:
authorPatrik Nyblom <pan@erlang.org>2010-08-27 14:51:02 +0200
committerPatrik Nyblom <pan@erlang.org>2010-08-31 15:42:52 +0200
commit9c1364f58f2987284ff28ab6ca19b1e01c434c8e (patch)
treeda0fa988be1b980098a137e833b0021b2e9dc235 /erts/epmd/src
parentd4b6817a2785d9ce026de40dadcc948e22afffe9 (diff)
downloadotp-9c1364f58f2987284ff28ab6ca19b1e01c434c8e.tar.gz
otp-9c1364f58f2987284ff28ab6ca19b1e01c434c8e.tar.bz2
otp-9c1364f58f2987284ff28ab6ca19b1e01c434c8e.zip
Teach epmd_cli.c to not respond 'Killed' when killing denied
Diffstat (limited to 'erts/epmd/src')
-rw-r--r--erts/epmd/src/epmd_cli.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index 2aed861390..7c60ba0420 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -42,7 +42,11 @@ void kill_epmd(EpmdVars *g)
epmd_cleanup_exit(g,1);
}
if ((rval = read_fill(fd,buf,2)) == 2) {
- printf("Killed\n");
+ if (buf[0] == 'O' && buf[1] == 'K') {
+ printf("Killed\n");
+ } else {
+ printf("Killing not allowed - living nodes in database.\n");
+ }
epmd_cleanup_exit(g,0);
} else if (rval < 0) {
printf("epmd: failed to read answer from local epmd\n");