Credit John Beck's fixes.

[~andy/fetchmail] / env.c

diff --git a/env.c b/env.c
index 6ff2d99ae5d84e0304f48cc467e2b03eb3f80e08..edf998983a88be540d639946ed9c8b669711f07f 100644 (file)
--- a/env.c
+++ b/env.c
@@ -19,24 +19,29 @@
 #ifdef HAVE_NET_SOCKET_H
 #include <net/socket.h>
 #endif
-#ifdef HAVE_GETHOSTBYNAME
 #include <netdb.h>
-#endif /* HAVE_GETHOSTBYNAME */
-#include  <sys/types.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 #include "fetchmail.h"
+#include "getaddrinfo.h"
 
 #include "i18n.h"
 #if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
 #include <locale.h>
 #endif
 
+#ifndef HAVE_DECL_GETENV
 extern char *getenv(const char *);     /* needed on sysV68 R3V7.1. */
+#endif
 
 void envquery(int argc, char **argv)
 /* set up basic stuff from the environment (including the rc file name) */
 {
     struct passwd by_name, by_uid, *pwp;
 
+    (void)argc;
+
+    (void)argc;
     if (!(user = getenv("FETCHMAILUSER")))
     {
        if (!(user = getenv("LOGNAME")))
@@ -102,10 +107,12 @@ void envquery(int argc, char **argv)
        user = xstrdup(pwp->pw_name);
     }
 
+    endpwent();
+
     /* compute user's home directory */
     home = getenv("HOME_ETC");
     if (!home && !(home = getenv("HOME")))
-       home = pwp->pw_dir;
+       home = xstrdup(pwp->pw_dir);
 
     /* compute fetchmail's home directory */
     if (!(fmhome = getenv("FETCHMAILHOME")))
@@ -132,10 +139,10 @@ void envquery(int argc, char **argv)
     strcat(rcfile, RCFILE_NAME);
 }
 
-char *host_fqdn(void)
-/* get the FQDN of the machine we're running */
+char *host_fqdn(int required)
 {
-    char       tmpbuf[HOSTLEN+1];
+    char tmpbuf[HOSTLEN+1];
+    char *result;
 
     if (gethostname(tmpbuf, sizeof(tmpbuf)))
     {
@@ -143,27 +150,43 @@ char *host_fqdn(void)
                program_name);
        exit(PS_DNS);
     }
-#ifdef HAVE_GETHOSTBYNAME
-    /* if we got a . in the hostname assume it is a FQDN */
+
+    /* if we got no . in the hostname, try to canonicalize it,
+     * else assume it is a FQDN */
     if (strchr(tmpbuf, '.') == NULL)
     {
-       struct hostent *hp;
+       /* if we got a basename without dots, as we often do in Linux,
+        * look up canonical name (make a FQDN of it) */
+       struct addrinfo hints, *res;
+       int e;
 
-       /** XXX FIXME: use getaddrinfo instead? */
-       /* if we got a basename (as we do in Linux) make a FQDN of it */
-       hp = gethostbyname(tmpbuf);
-       if (hp == (struct hostent *) NULL)
-       {
+       memset(&hints, 0, sizeof hints);
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_STREAM;
+       hints.ai_flags = AI_CANONNAME;
+
+       e = fm_getaddrinfo(tmpbuf, NULL, &hints, &res);
+       if (e) {
            /* exit with error message */
            fprintf(stderr,
                    GT_("gethostbyname failed for %s\n"), tmpbuf);
-           exit(PS_DNS);
+           fprintf(stderr, "%s", gai_strerror(e));
+           fprintf(stderr, GT_("Cannot find my own host in hosts database to qualify it!\n"));
+           if (required)
+               exit(PS_DNS);
+           else {
+               fprintf(stderr, GT_("Trying to continue with unqualified hostname.\nDO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\nDO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"));
+               return xstrdup(tmpbuf);
+           }
        }
-       return(xstrdup(hp->h_name));
+
+       result = xstrdup(res->ai_canonname ? res->ai_canonname : tmpbuf);
+       fm_freeaddrinfo(res);
     }
     else
-#endif /* HAVE_GETHOSTBYNAME */
-       return(xstrdup(tmpbuf));
+       result = xstrdup(tmpbuf);
+
+    return result;
 }
 
 static char *tzoffset(time_t *now)
@@ -227,7 +250,7 @@ char *rfc822timestamp(void)
      * date format ctime(3) emits is not RFC822
      * conformant.
      */
-    strcpy(buf, ctime(&now));
+    strlcpy(buf, ctime(&now), sizeof(buf));
     buf[strlen(buf)-1] = '\0'; /* remove trailing \n */
 #endif /* HAVE_STRFTIME */
 
@@ -271,9 +294,9 @@ char *visbuf(const char *buf)
 
     needed = strlen(buf) * 5 + 1; /* worst case: HEX, plus NUL byte */
 
-    if (needed > vbufs) {
+    if (!vbuf || needed > vbufs) {
        vbufs = needed;
-       vbuf = xrealloc(vbuf, vbufs);
+       vbuf = (char *)xrealloc(vbuf, vbufs);
     }
 
     tp = vbuf;
@@ -299,7 +322,7 @@ char *visbuf(const char *buf)
            buf++;
        }
     }
-    *tp++ = '\0';
+    *tp = '\0';
     return(vbuf);
 }
 /* env.c ends here */