From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Wed, 12 Jan 2011 18:07:49 +0100 Subject: [Cluster-devel] [PATCH] rgmanager: Make clufindhostname -i predictable In-Reply-To: <1294850820-10301-1-git-send-email-lhh@redhat.com> References: <1294850820-10301-1-git-send-email-lhh@redhat.com> Message-ID: <4D2DDFE5.4000507@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit ACK?ed. Fabio On 1/12/2011 5:47 PM, Lon Hohberger wrote: > This is a clean cherry-pick into the RHEL6 branch > > Resolves: rhbz#661881 > > Signed-off-by: Lon Hohberger > --- > 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 42e1691..f8bf7fd 100644 > --- a/rgmanager/src/utils/clufindhostname.c > +++ b/rgmanager/src/utils/clufindhostname.c > @@ -24,7 +24,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) { > @@ -47,8 +47,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); > } >