Removed --with-smtpservers configure option and thelike

[mmh] / sbr / client.c

diff --git a/sbr/client.c b/sbr/client.c
index ae6968f..92e0711 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -2,8 +2,6 @@
 /*
  * client.c -- connect to a server
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -49,10 +47,6 @@ client (char *args, char *service, char *response, int len_response, int debug)
     if (args != NULL && *args != 0) {
        ap = client_copyip (client_brkstring (client_getcpy (args), " ", "\n"),
                ap, MAXARGS);
-    } else {
-       if (servers != NULL && *servers != 0)
-           ap = client_copyip (client_brkstring (client_getcpy (servers), " ", "\n"),
-               ap, MAXARGS);
     }
     if (ap == arguments) {
        *ap++ = client_getcpy ("localhost");
@@ -60,7 +54,9 @@ client (char *args, char *service, char *response, int len_response, int debug)
     }
 
     memset(&hints, 0, sizeof(hints));
+#ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
+#endif
     hints.ai_family = PF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 
@@ -85,7 +81,7 @@ client (char *args, char *service, char *response, int len_response, int debug)
                char address[NI_MAXHOST];
 
                rc = getnameinfo(ai->ai_addr, ai->ai_addrlen, address,
-                                sizeof(address), NULL, NULL, NI_NUMERICHOST);
+                                sizeof(address), NULL, 0, NI_NUMERICHOST);
 
                fprintf(stderr, "Connecting to %s...\n",
                        rc ? "unknown" : address);
@@ -111,9 +107,10 @@ client (char *args, char *service, char *response, int len_response, int debug)
 
            close(sd);
        }
+
+       freeaddrinfo(res);
     }
 
-    freeaddrinfo(res);
     client_freelist(ap);
     strncpy (response, "no servers available", len_response);
     return NOTOK;