X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=env.c;h=7d03ae170a463502476d59b13bfae242fbd49a54;hb=f16d8d23439b5569f0c2e1af22494708b507f277;hp=b3d27164f4171edf77c149d5449a80e05480b543;hpb=7c57be7e7568fd784adf044bbe1af088f726ccf4;p=~andy%2Ffetchmail

diff --git a/env.c b/env.c
index b3d27164..7d03ae17 100644
--- a/env.c
+++ b/env.c
@@ -8,35 +8,29 @@
 #include "config.h"
 #include <stdio.h>
 #include <ctype.h>
-#if defined(STDC_HEADERS)
 #include <stdlib.h>
-#endif
-#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
-#endif
 #include <pwd.h>
 #include <string.h>
-#ifdef HAVE_NET_SOCKET_H
-#include <net/socket.h>
-#endif
 #include <netdb.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 "gettext.h"
+#if defined(ENABLE_NLS)
 #include <locale.h>
 #endif
 
-extern char *getenv(const char *);	/* needed on sysV68 R3V7.1. */
-
 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 +96,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,8 +128,7 @@ 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 *result;
@@ -145,29 +140,37 @@ char *host_fqdn(void)
 	exit(PS_DNS);
     }
 
-    /* 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)
     {
-	/* if we got a basename (as we do in Linux) make a FQDN of it */
+	/* 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;
 
 	memset(&hints, 0, sizeof hints);
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags=AI_CANONNAME;
+	hints.ai_flags = AI_CANONNAME;
 
-	e = getaddrinfo(tmpbuf, NULL, &hints, &res);
+	e = fm_getaddrinfo(tmpbuf, NULL, &hints, &res);
 	if (e) {
 	    /* exit with error message */
 	    fprintf(stderr,
 		    GT_("gethostbyname failed for %s\n"), tmpbuf);
 	    fprintf(stderr, "%s", gai_strerror(e));
-	    exit(PS_DNS);
+	    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);
+	    }
 	}
 
-	result = xstrdup(res->ai_canonname);
-	freeaddrinfo(res);
+	result = xstrdup(res->ai_canonname ? res->ai_canonname : tmpbuf);
+	fm_freeaddrinfo(res);
     }
     else
 	result = xstrdup(tmpbuf);
@@ -212,7 +215,6 @@ char *rfc822timestamp(void)
     static char buf[50];
 
     time(&now);
-#ifdef HAVE_STRFTIME
     /*
      * Conform to RFC822.  We generate a 4-digit year here, avoiding
      * Y2K hassles.  Max length of this timestamp in an English locale
@@ -221,25 +223,15 @@ char *rfc822timestamp(void)
      * weird multibyte i18n characters (such as kanji) from showing up
      * in your Received headers.
      */
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
     setlocale (LC_TIME, "C");
 #endif
     strftime(buf, sizeof(buf)-1, 
 	     "%a, %d %b %Y %H:%M:%S XXXXX (%Z)", localtime(&now));
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
     setlocale (LC_TIME, "");
 #endif
     strncpy(strstr(buf, "XXXXX"), tzoffset(&now), 5);
-#else
-    /*
-     * This is really just a portability fallback, as the
-     * date format ctime(3) emits is not RFC822
-     * conformant.
-     */
-    strlcpy(buf, ctime(&now), sizeof(buf));
-    buf[strlen(buf)-1] = '\0';	/* remove trailing \n */
-#endif /* HAVE_STRFTIME */
-
     return(buf);
 }
 
@@ -249,13 +241,8 @@ const char *showproto(int proto)
     switch (proto)
     {
     case P_AUTO: return("auto");
-#ifdef POP2_ENABLE
-    case P_POP2: return("POP2");
-#endif /* POP2_ENABLE */
 #ifdef POP3_ENABLE
     case P_POP3: return("POP3");
-    case P_APOP: return("APOP");
-    case P_RPOP: return("RPOP");
 #endif /* POP3_ENABLE */
 #ifdef IMAP_ENABLE
     case P_IMAP: return("IMAP");
@@ -280,9 +267,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;
@@ -308,7 +295,7 @@ char *visbuf(const char *buf)
 	    buf++;
 	}
     }
-    *tp++ = '\0';
+    *tp = '\0';
     return(vbuf);
 }
 /* env.c ends here */