rgmanager: master - rgmanager: Fix poor -F handling on enable

rgmanager: master - rgmanager: Fix poor -F handling on enable

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=a4fd027c15edfbafd93b269a5b84d7eaad9404ea
Commit:        a4fd027c15edfbafd93b269a5b84d7eaad9404ea
Parent:        aa6b71498a1a90f9c94ff0549847c145fc73d8b5
Author:        Yevheniy Demchenko <zheka@uvt.cz>
AuthorDate:    Thu Feb 26 15:17:23 2009 -0500
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Feb 26 15:17:23 2009 -0500

rgmanager: Fix poor -F handling on enable

Fixes these two issues (rhbz486711, rhbz486717):
* Rgmanager crashes if no members of a restricted
  failover domain are online and you enable with -F
* Rgmanager does not correctly restart services if
  they fail on the first node when using -F during
  enable

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/rg_state.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 7756d29..ad6ba1f 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2152,13 +2152,16 @@ handle_fd_start_req(char *svcName, int request, int *new_owner)
 		target = best_target_node(allowed_nodes, 0,
 	 				  svcName, 1);
 	  	if (target == me) {
-	   		ret = handle_start_remote_req(svcName, request);
+ 		      	ret = handle_start_remote_req(svcName,
+				(request==RG_ENABLE?RG_START_RECOVER:request));
 			if (ret == RG_EAGAIN)
 				goto out;
-	    	} else if (target < 0) {
+		} else if (!(target > 0)) {
 			goto out;
 	       	} else {
-			ret = svc_start_remote(svcName, RG_START_REMOTE,
+			ret = svc_start_remote(svcName,
+					       (request==RG_ENABLE?
+					    RG_START_RECOVER:RG_START_REMOTE),
 					       target);
 		}