cluster: STABLE3 - fence: Make fence_node return 2 for no fencing

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3cf06ec85044817b96fa4c778a959b10c6f71737
Commit:        3cf06ec85044817b96fa4c778a959b10c6f71737
Parent:        40f6289f257fe1338cadfb5329acb1cf450342bc
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Tue Jun 23 11:10:34 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Jun 23 11:30:06 2009 -0400

fence: Make fence_node return 2 for no fencing

This makes fence_node return values consistent
between fencing and unfencing cases.

Signed-off-by: Lon Hohberger <lhh@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com
---
 fence/fence_node/fence_node.c |    6 +++++-
 fence/libfence/agent.c        |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fence/fence_node/fence_node.c b/fence/fence_node/fence_node.c
index 98d67c6..a98962a 100644
--- a/fence/fence_node/fence_node.c
+++ b/fence/fence_node/fence_node.c
@@ -225,7 +225,11 @@ int main(int argc, char *argv[])
 			rv = EXIT_SUCCESS;
 		}
 	} else {
-		if (error) {
+		if (error == -2) {
+			fprintf(stderr, "fence %s undefined\n", victim);
+			logt_print(LOG_ERR, "fence %s undefined\n", victim);
+			rv = 2;
+		} else if (error) {
 			fprintf(stderr, "fence %s failed\n", victim);
 			logt_print(LOG_ERR, "fence %s failed\n", victim);
 			rv = EXIT_FAILURE;
diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c
index 57163aa..49e6795 100644
--- a/fence/libfence/agent.c
+++ b/fence/libfence/agent.c
@@ -307,7 +307,7 @@ int fence_node(char *victim, struct fence_log *log, int log_size,
 			left--;
 		}
 		count++;
-		error = -1;
+		error = -2;		/* No fencing */
 		goto out;
 	}