X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmts.c;h=6a9d84f48f13fe36a45686a220202ad71a149fb5;hp=40d4e279361fc42e9da895ff5e109a58e5456c0f;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/sbr/mts.c b/sbr/mts.c
index 40d4e27..6a9d84f 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -2,8 +2,6 @@
 /*
  * mts.c -- definitions for the mail transport system
  *
- * $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.
@@ -11,6 +9,7 @@
 
 #include <h/mh.h>   /* for snprintf() */
 #include <h/nmh.h>
+#include <h/utils.h>
 
 #define nmhetcdir(file) NMHETCDIR#file
 
@@ -27,13 +26,14 @@
 #define	NOTOK   (-1)
 #define	OK        0
 
-extern int errno;
-
 /*
  * static prototypes
  */
-static char *tailor_value (char *);
+static char *tailor_value (unsigned char *);
 static void getuserinfo (void);
+static const char *get_mtsconf_pathname(void);
+static const char *get_mtsuserconf_pathname(void);
+static void mts_read_conf_file (FILE *fp);
 
 /*
  * *mmdfldir and *uucpldir are the maildrop directories.  If maildrops
@@ -173,35 +173,22 @@ static struct bind binds[] = {
 void
 mts_init (char *name)
 {
-    char *bp, *cp, buffer[BUFSIZ];
-    struct bind *b;
+    const char *cp;
     FILE *fp;
     static int inited = 0;
 
-    if (inited++ || (fp = fopen (mtsconf, "r")) == NULL)
+    if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
 	return;
+    mts_read_conf_file(fp);
+    fclose (fp);
 
-    while (fgets (buffer, sizeof(buffer), fp)) {
-	if (!(cp = strchr(buffer, '\n')))
-	    break;
-	*cp = 0;
-	if (*buffer == '#' || *buffer == '\0')
-	    continue;
-	if (!(bp = strchr(buffer, ':')))
-	    break;
-	*bp++ = 0;
-	while (isspace (*bp))
-	    *bp++ = 0;
-
-	for (b = binds; b->keyword; b++)
-	    if (!strcmp (buffer, b->keyword))
-		break;
-	if (b->keyword && (cp = tailor_value (bp)))
-	    *b->value = cp;
+    cp = get_mtsuserconf_pathname();
+    if (cp != NULL &&
+            ((fp = fopen (get_mtsuserconf_pathname(), "r")) != NULL)) {
+        mts_read_conf_file(fp);
+        fclose (fp);
     }
 
-    fclose (fp);
-
     Everyone = atoi (everyone);
 
     if (strstr(masquerade, "draft_from") != NULL)
@@ -234,7 +221,7 @@ mts_init (char *name)
  */
 
 static char *
-tailor_value (char *s)
+tailor_value (unsigned char *s)
 {
     int i, r;
     char *bp;
@@ -273,8 +260,8 @@ tailor_value (char *s)
     *bp = 0;
 
     len = strlen (buffer) + 1;
-    if ((bp = malloc (len)))
-	memcpy (bp, buffer, len);
+    bp = mh_xmalloc (len);
+    memcpy (bp, buffer, len);
 
     return bp;
 }
@@ -287,8 +274,7 @@ char *
 LocalName (void)
 {
     static char buffer[BUFSIZ] = "";
-    struct hostent *hp;
-
+    struct addrinfo hints, *res;
 #ifdef HAVE_UNAME
     struct utsname name;
 #endif
@@ -303,20 +289,24 @@ LocalName (void)
     if (*localname) {
 	strncpy (buffer, localname, sizeof(buffer));
     } else {
+	memset(buffer, 0, sizeof(buffer));
 #ifdef HAVE_UNAME
 	/* first get our local name */
 	uname (&name);
-	strncpy (buffer, name.nodename, sizeof(buffer));
+	strncpy (buffer, name.nodename, sizeof(buffer) - 1);
 #else
 	/* first get our local name */
-	gethostname (buffer, sizeof(buffer));
+	gethostname (buffer, sizeof(buffer) - 1);
 #endif
-#ifdef HAVE_SETHOSTENT
-	sethostent (1);
-#endif 
 	/* now fully qualify our name */
-	if ((hp = gethostbyname (buffer)))
-	    strncpy (buffer, hp->h_name, sizeof(buffer));
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_flags = AI_CANONNAME;
+	hints.ai_family = PF_UNSPEC;
+	if (getaddrinfo(buffer, NULL, &hints, &res) == 0) {
+	    strncpy(buffer, res->ai_canonname, sizeof(buffer) - 1);
+	    freeaddrinfo(res);
+	}
     }
 
     /*
@@ -407,7 +397,8 @@ getfullname (void)
 static void
 getuserinfo (void)
 {
-    register char *cp, *np;
+    register unsigned char *cp;
+    register char *np;
     register struct passwd *pw;
 
 #ifdef KPOP
@@ -525,3 +516,50 @@ getuserinfo (void)
 
     return;
 }
+
+static const char*
+get_mtsconf_pathname (void)
+{
+    const char *cp = getenv ( "MHMTSCONF ");
+    if (cp != NULL && *cp != '\0') {
+        return cp;
+    }
+    return mtsconf;
+}
+
+static const char*
+get_mtsuserconf_pathname (void)
+{
+    const char *cp = getenv ( "MHMTSUSERCONF" );
+    if (cp != NULL && *cp != '\0') {
+        return cp;
+    }
+    return NULL;
+}
+
+static void
+mts_read_conf_file (FILE *fp)
+{
+    unsigned char *bp;
+    char *cp, buffer[BUFSIZ];
+    struct bind *b;
+
+    while (fgets (buffer, sizeof(buffer), fp)) {
+	if (!(cp = strchr(buffer, '\n')))
+	    break;
+	*cp = 0;
+	if (*buffer == '#' || *buffer == '\0')
+	    continue;
+	if (!(bp = strchr(buffer, ':')))
+	    break;
+	*bp++ = 0;
+	while (isspace (*bp))
+	    *bp++ = 0;
+
+	for (b = binds; b->keyword; b++)
+	    if (!strcmp (buffer, b->keyword))
+		break;
+	if (b->keyword && (cp = tailor_value (bp)))
+	    *b->value = cp;
+    }
+}