diff options
| -rw-r--r-- | support/export/hostname.c | 6 | ||||
| -rw-r--r-- | tests/nsm_client/nsm_client.c | 2 | ||||
| -rw-r--r-- | utils/mount/network.c | 3 | ||||
| -rw-r--r-- | utils/mount/stropts.c | 5 | ||||
| -rw-r--r-- | utils/statd/hostname.c | 4 | ||||
| -rw-r--r-- | utils/statd/sm-notify.c | 5 |
6 files changed, 2 insertions, 23 deletions
diff --git a/support/export/hostname.c b/support/export/hostname.c index 3c55ce7..efcb75c 100644 --- a/support/export/hostname.c +++ b/support/export/hostname.c @@ -30,10 +30,6 @@ #include "sockaddr.h" #include "exportfs.h" -#ifndef HAVE_DECL_AI_ADDRCONFIG -#define AI_ADDRCONFIG 0 -#endif - /** * host_ntop - generate presentation address given a sockaddr * @sap: pointer to socket address @@ -170,7 +166,7 @@ host_addrinfo(const char *hostname) #endif /* don't return duplicates */ .ai_protocol = (int)IPPROTO_UDP, - .ai_flags = AI_ADDRCONFIG | AI_CANONNAME, + .ai_flags = AI_CANONNAME, }; int error; diff --git a/tests/nsm_client/nsm_client.c b/tests/nsm_client/nsm_client.c index 0d1159a..0fa3422 100644 --- a/tests/nsm_client/nsm_client.c +++ b/tests/nsm_client/nsm_client.c @@ -205,7 +205,7 @@ nsm_client_get_rpcclient(const char *node) { unsigned short port; struct addrinfo *ai; - struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG }; + struct addrinfo hints = { }; int err; CLIENT *client = NULL; diff --git a/utils/mount/network.c b/utils/mount/network.c index 5b515c3..21a7a2c 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -210,9 +210,6 @@ int nfs_lookup(const char *hostname, const sa_family_t family, { struct addrinfo *gai_results; struct addrinfo gai_hint = { -#ifdef HAVE_DECL_AI_ADDRCONFIG - .ai_flags = AI_ADDRCONFIG, -#endif /* HAVE_DECL_AI_ADDRCONFIG */ .ai_family = family, }; socklen_t len = *salen; diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 50a1a2a..bcc36f3 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -49,10 +49,6 @@ #include "parse_dev.h" #include "conffile.h" -#ifndef HAVE_DECL_AI_ADDRCONFIG -#define AI_ADDRCONFIG 0 -#endif - #ifndef NFS_PROGRAM #define NFS_PROGRAM (100003) #endif @@ -343,7 +339,6 @@ static int nfs_validate_options(struct nfsmount_info *mi) { struct addrinfo hint = { .ai_protocol = (int)IPPROTO_UDP, - .ai_flags = AI_ADDRCONFIG, }; sa_family_t family; int error; diff --git a/utils/statd/hostname.c b/utils/statd/hostname.c index 38f2265..616a3cb 100644 --- a/utils/statd/hostname.c +++ b/utils/statd/hostname.c @@ -39,10 +39,6 @@ #include "statd.h" #include "xlog.h" -#ifndef HAVE_DECL_AI_ADDRCONFIG -#define AI_ADDRCONFIG 0 -#endif - /** * statd_present_address - convert sockaddr to presentation address * @sap: pointer to socket address to convert diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 437e37a..b7f4371 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -34,10 +34,6 @@ #include "nsm.h" #include "nfsrpc.h" -#ifndef HAVE_DECL_AI_ADDRCONFIG -#define AI_ADDRCONFIG 0 -#endif - #define NSM_TIMEOUT 2 #define NSM_MAX_TIMEOUT 120 /* don't make this too big */ @@ -78,7 +74,6 @@ smn_lookup(const char *name) { struct addrinfo *ai = NULL; struct addrinfo hint = { - .ai_flags = AI_ADDRCONFIG, .ai_family = (nsm_family == AF_INET ? AF_INET: AF_UNSPEC), .ai_protocol = (int)IPPROTO_UDP, }; |