[Cluster-devel] [PATCH] rgmanager: Make clufindhostname -i predictable
Fabio M. Di Nitto
fdinitto at redhat.com
Wed Jan 12 17:07:49 UTC 2011
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 <lhh at 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 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);
> }
>
More information about the Cluster-devel
mailing list