Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > e536fc0c6270ec1d92a0fd41bb1f8360 > files > 100

rgmanager-2.0.52-28.el5_8.2.src.rpm

From 205d7b2096b288329226cf8be6dae9f870c346cb Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Thu, 9 Dec 2010 16:01:27 -0500
Subject: [PATCH] rgmanager: Make clufindhostname -i predictable

Resolves: rhbz#592613

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/utils/clufindhostname.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/utils/clufindhostname.c b/rgmanager/src/utils/clufindhostname.c
index cd91c76..0409d5b 100644
--- a/rgmanager/src/utils/clufindhostname.c
+++ b/rgmanager/src/utils/clufindhostname.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
 	void *ptr;
 	struct in_addr  addr4;
 	struct in6_addr addr6;
-	int opt, size, family;
+	int opt, size, family, ret;
 	char *sep;
 
 	if (argc != 3) {
@@ -66,8 +66,10 @@ main(int argc, char **argv)
 				size = sizeof(addr6);
 			}
 
-			if (inet_pton(family, optarg, ptr) < 0) {
-				perror("inet_pton");
+			ret = inet_pton(family, optarg, ptr);
+			if (ret <= 0) {
+				if (ret < 0)
+					perror("inet_pton");
 				exit(2);
 			}
 
-- 
1.7.3.4