sm-notify: Disable syslog messages when debugging is enabled

[nfs-utils.git] / utils / statd / sm-notify.c

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 437e37a6b49de679f72b9663324faad4b346723d..f05eadf5d5b43e2be52525ac5c515a4253c80fcd 100644 (file)
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -34,8 +34,9 @@
 #include "nsm.h"
 #include "nfsrpc.h"
 
-#ifndef HAVE_DECL_AI_ADDRCONFIG
-#define AI_ADDRCONFIG  0
+/* glibc before 2.3.4 */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
 #endif
 
 #define NSM_TIMEOUT    2
@@ -78,7 +79,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,
        };
@@ -253,6 +253,7 @@ smn_bind_address(const char *srcaddr, const char *srcport)
        if (srcaddr == NULL)
                hint.ai_flags |= AI_PASSIVE;
 
+       /* Do not allow "node" and "service" parameters both to be NULL */
        if (srcport == NULL)
                error = getaddrinfo(srcaddr, "", &hint, &ai);
        else
@@ -394,12 +395,14 @@ usage:            fprintf(stderr,
                exit(1);
        }
 
-       xlog_syslog(1);
        if (opt_debug) {
+               xlog_syslog(0);
                xlog_stderr(1);
                xlog_config(D_ALL, 1);
-       } else
+       } else {
+               xlog_syslog(1);
                xlog_stderr(0);
+       }
 
        xlog_open(progname);
        xlog(L_NOTICE, "Version " VERSION " starting");