rgmanager: Make clufindhostname -i predictable
PATCH 1/1 rgmanager: Make clufindhostname -i predictable
This is a clean cherry-pick into the RHEL6 branch
Resolves: rhbz#661881
Signed-off-by Lon Hohberger <[email protected]>
--- rgmanager/src/utils/clufindhostname.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
rgmanager/src/utils/clufindhostname.c +5 -3
@@ -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 ); }
Signature · 1 line
1.7.1.1
PATCH 1/1 rgmanager: Make clufindhostname -i predictable
ACK?ed.
Fabio
Quoted 35 lines · Lon Hohberger
This is a clean cherry-pick into the RHEL6 branch
Resolves: rhbz#661881
Signed-off-by Lon Hohberger <[email protected]>--- rgmanager/src/utils/clufindhostname.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)rgmanager/src/utils/clufindhostname.c +5
-3@@ -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 ); }