Added many flags to CFLAGS with gcc, if supported.

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 868e603c5a506170cf275963dba9cfca62e28c42..5f4e3676daa16d85198502af87872aff8e029919 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -1,21 +1,19 @@
-
-/*
- * mts.c -- definitions for the mail transport system
+/* mts.c -- definitions for the mail transport system

  *
  * 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.
  */
 
  *
  * 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.
  */
 

-#include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "escape_addresses.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/utils.h"

 
 #define nmhetcdir(file) NMHETCDIR#file
 
 
 #define nmhetcdir(file) NMHETCDIR#file
 

-#include <ctype.h>
-#include <stdio.h>
-#include <h/mts.h>
+#include "h/mts.h"

 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>


@@ -23,10 +21,10 @@
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static char *tailor_value (unsigned char *);
+static void read_mts(const char *path);
+static char *tailor_value (char *);

 static void getuserinfo (void);
 static void getuserinfo (void);

-static const char *get_mtsconf_pathname(void);
-static const char *get_mtsuserconf_pathname(void);
+static const char *get_optional_env_var(const char *name, const char *fallback);

 static void mts_read_conf_file (FILE *fp);
 
 /*
 static void mts_read_conf_file (FILE *fp);
 
 /*


@@ -40,8 +38,6 @@ static void mts_read_conf_file (FILE *fp);
 /*
  * nmh mail transport interface customization file
  */
 /*
  * nmh mail transport interface customization file
  */

-static char *mtsconf = nmhetcdir(/mts.conf);
-

 static char *localname   = "";
 static char *localdomain = "";
 static char *systemname  = "";
 static char *localname   = "";
 static char *localdomain = "";
 static char *systemname  = "";


@@ -51,28 +47,22 @@ char *mmdflfil = "";
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 

-char *mmdlm1 = "\001\001\001\001\n";
-char *mmdlm2 = "\001\001\001\001\n";
+char *spoollocking = DEFAULT_LOCKING;

 
 

-/* Cache the username and fullname of the user */
+/* Cache the username, fullname, mailbox name, and mailbox of the user */

 static char username[BUFSIZ];
 static char fullname[BUFSIZ];
 static char username[BUFSIZ];
 static char fullname[BUFSIZ];

-
-/* Variables for username masquerading: */
-       boolean  draft_from_masquerading = FALSE;  /* also used from post.c */
-static boolean  mmailid_masquerading = FALSE;
-       boolean  username_extension_masquerading = FALSE;  /* " from addrsbr.c */
-static char*    masquerade = "";
+/* mboxname comes from a Local-Mailbox profile component, or if that
+   doesn't exist, the username. */
+static char mboxname[BUFSIZ];
+static char localmbox[2*BUFSIZ+3];

 
 /*
  * MTS specific variables
  */
 
 /*
  * MTS specific variables
  */

-#if defined(SMTPMTS)
-static char *sm_method = "smtp";
+static char *mts_method = "smtp";

 int  sm_mts    = MTS_SMTP;
 int  sm_mts    = MTS_SMTP;

-char *hostable = nmhetcdir(/hosts);

 char *sendmail = SENDMAILPATH;
 char *sendmail = SENDMAILPATH;

-#endif

 
 /*
  * SMTP/POP stuff
 
 /*
  * SMTP/POP stuff


@@ -87,13 +77,6 @@ char *pophost    = "";
 char *maildelivery = nmhetcdir(/maildelivery);
 
 
 char *maildelivery = nmhetcdir(/maildelivery);
 
 

-/*
- * Aliasing Facility (doesn't belong here)
- */
-int Everyone = NOTOK;
-static char *everyone = "-1";
-char *NoShell = "";
-

 /*
  * Customize the MTS settings for nmh by adjusting
  * the file mts.conf in the nmh etc directory.
 /*
  * Customize the MTS settings for nmh by adjusting
  * the file mts.conf in the nmh etc directory.


@@ -110,76 +93,78 @@ static struct bind binds[] = {
     { "systemname", &systemname },
     { "mmdfldir", &mmdfldir },
     { "mmdflfil", &mmdflfil },
     { "systemname", &systemname },
     { "mmdfldir", &mmdfldir },
     { "mmdflfil", &mmdflfil },

+    { "spoollocking", &spoollocking },

     { "uucpldir", &uucpldir },
     { "uucplfil", &uucplfil },
     { "uucpldir", &uucpldir },
     { "uucplfil", &uucplfil },

-    { "mmdelim1", &mmdlm1 },
-    { "mmdelim2", &mmdlm2 },
-    { "masquerade", &masquerade },
-
-#if defined(SMTPMTS)
-    { "mts",      &sm_method },
-    { "hostable", &hostable  },
+    { "mts",      &mts_method },

     { "sendmail", &sendmail  },
     { "sendmail", &sendmail  },

-#endif
-

     { "clientname",  &clientname },
     { "servers", &servers },
     { "pophost", &pophost },
 
     { "maildelivery", &maildelivery },
     { "clientname",  &clientname },
     { "servers", &servers },
     { "pophost", &pophost },
 
     { "maildelivery", &maildelivery },

-    { "everyone", &everyone },
-    { "noshell", &NoShell },

     { NULL, NULL }
 };
 
 
     { NULL, NULL }
 };
 
 

+/* Convert name of mts method to integer value and store it. */
+void
+save_mts_method (const char *value)
+{
+    if (! strcasecmp (value, "smtp")) {
+        mts_method = "smtp";
+        sm_mts = MTS_SMTP;
+    } else if (! strcasecmp (value, "sendmail/smtp")  ||
+               ! strcasecmp (value, "sendmail")) {
+        mts_method = "sendmail/smtp";
+        sm_mts = MTS_SENDMAIL_SMTP;
+    } else if (! strcasecmp (value, "sendmail/pipe")) {
+        mts_method = "sendmail/pipe";
+        sm_mts = MTS_SENDMAIL_PIPE;
+    } else {
+        die("unsupported mts selection \"%s\"", value);
+    }
+}
+
+

 /*
  * Read the configuration file for the nmh interface
  * to the mail transport system (MTS).
  */
 
 void
 /*
  * Read the configuration file for the nmh interface
  * to the mail transport system (MTS).
  */
 
 void

-mts_init (char *name)
+mts_init (void)

 {
 {

-    NMH_UNUSED (name);
+    static bool deja_vu;
+    const char *path;

 
 

-    const char *cp;
-    FILE *fp;
-    static int inited = 0;
+    if (deja_vu)
+        return;
+    deja_vu = true;

 
 

-    if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
-       return;
-    mts_read_conf_file(fp);
-    fclose (fp);
-
-    cp = get_mtsuserconf_pathname();
-    if (cp != NULL &&
-            ((fp = fopen (get_mtsuserconf_pathname(), "r")) != NULL)) {
-        mts_read_conf_file(fp);
-        fclose (fp);
-    }
+    path = get_optional_env_var("MHMTSCONF", NMHETCDIR "/mts.conf");
+    read_mts(path);

 
 

-    Everyone = atoi (everyone);
+    path = get_optional_env_var("MHMTSUSERCONF", NULL);
+    if (path)
+        read_mts(path);

 
 

-    if (strstr(masquerade, "draft_from") != NULL)
-       draft_from_masquerading = TRUE;
+    save_mts_method (mts_method);
+}

 
 

-    if (strstr(masquerade, "mmailid") != NULL)
-       mmailid_masquerading = TRUE;

 
 

-    if (strstr(masquerade, "username_extension") != NULL)
-       username_extension_masquerading = TRUE;
+static void read_mts(const char *path)
+{
+    FILE *fp;

 
 

-#ifdef SMTPMTS
-    if (strcmp(sm_method, "smtp") == 0)
-        sm_mts = MTS_SMTP;
-    else if (strcmp(sm_method, "sendmail") == 0)
-        sm_mts = MTS_SENDMAIL;
-    else {
-        advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
-        sm_mts = MTS_SMTP;
-    }
-#endif
+    fp = fopen(path, "r");
+    if (!fp)
+        adios(path, "error opening mts.conf:");
+    mts_read_conf_file(fp);
+    if (ferror(fp))
+        adios(path, "error reading mts.conf:");
+    if (fclose(fp))
+        adios(path, "error closing mts.conf:");

 }
 
 
 }
 
 


@@ -191,12 +176,11 @@ mts_init (char *name)
  */
 
 static char *
  */
 
 static char *

-tailor_value (unsigned char *s)
+tailor_value (char *s)

 {
     int i, r;
     char *bp;
     char buffer[BUFSIZ];
 {
     int i, r;
     char *bp;
     char buffer[BUFSIZ];

-    size_t len;

 
     for (bp = buffer; *s; bp++, s++) {
        if (*s != QUOTE) {
 
     for (bp = buffer; *s; bp++, s++) {
        if (*s != QUOTE) {


@@ -209,18 +193,19 @@ tailor_value (unsigned char *s)
                case 't': *bp = '\t'; break;
 
                case 0: s--;
                case 't': *bp = '\t'; break;
 
                case 0: s--;

-               case QUOTE: 
+                   /* FALLTHRU */
+               case QUOTE:

                    *bp = QUOTE;
                    break;
 
                    *bp = QUOTE;
                    break;
 

-               default: 
-                   if (!isdigit (*s)) {
+               default:
+                   if (!isdigit ((unsigned char) *s)) {

                        *bp++ = QUOTE;
                        *bp = *s;
                    }
                        *bp++ = QUOTE;
                        *bp = *s;
                    }

-                   r = *s != '0' ? 10 : 8;
-                   for (i = 0; isdigit (*s); s++)
-                       i = i * r + *s - '0';
+                   r = ((unsigned char) *s) != '0' ? 10 : 8;
+                   for (i = 0; isdigit ((unsigned char) *s); s++)
+                       i *= r + ((unsigned char) *s) - '0';

                    s--;
                    *bp = toascii (i);
                    break;
                    s--;
                    *bp = toascii (i);
                    break;


@@ -229,11 +214,7 @@ tailor_value (unsigned char *s)
     }
     *bp = 0;
 
     }
     *bp = 0;
 

-    len = strlen (buffer) + 1;
-    bp = mh_xmalloc (len);
-    memcpy (bp, buffer, len);
-
-    return bp;
+    return mh_xstrdup(buffer);

 }
 
 /*
 }
 
 /*


@@ -253,7 +234,7 @@ LocalName (int flag)
     struct addrinfo hints, *res;
 
     if (flag < 0 || flag > 1)
     struct addrinfo hints, *res;
 
     if (flag < 0 || flag > 1)

-       return NULL;
+       return NULL;

 
     buf = buffer[flag];
 
 
     buf = buffer[flag];
 


@@ -261,18 +242,18 @@ LocalName (int flag)
     if (buf[0])
        return buf;
 
     if (buf[0])
        return buf;
 

-    mts_init ("mts");
+    mts_init ();

 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {
 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {

-       strncpy (buf, localname, sizeof(buffer0));
+       strncpy (buf, localname, sizeof(buffer0) - 1);

     } else {
        memset(buf, 0, sizeof(buffer0));
        /* first get our local name */
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 
     } else {
        memset(buf, 0, sizeof(buffer0));
        /* first get our local name */
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 

-       memset(&hints, 0, sizeof(hints));
+        ZERO(&hints);

        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {
        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {


@@ -308,11 +289,11 @@ SystemName (void)
     if (buffer[0])
        return buffer;
 
     if (buffer[0])
        return buffer;
 

-    mts_init ("mts");
+    mts_init ();

 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {
 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {

-       strncpy (buffer, systemname, sizeof(buffer));
+       strncpy (buffer, systemname, sizeof(buffer) - 1);

        return buffer;
     }
 
        return buffer;
     }
 


@@ -324,15 +305,19 @@ SystemName (void)
 
 /*
  * Get the username of current user
 
 /*
  * Get the username of current user

+ *
+ * If flag is 0, then attempt to extract username from Local-Mailbox profile
+ *   component, if present.
+ * If flag is 1, then only use the "proper" local hostname.

  */
 
 char *
  */
 
 char *

-getusername (void)
+getusername (int flag)

 {
     if (username[0] == '\0')
        getuserinfo();
 
 {
     if (username[0] == '\0')
        getuserinfo();
 

-    return username;
+    return flag == 0 ? mboxname : username;

 }
 
 
 }
 
 


@@ -352,17 +337,29 @@ getfullname (void)
 
 
 /*
 
 
 /*

- * Find the user's username and full name, and cache them.
- * Also, handle "mmailid" username masquerading controlled from the GECOS field
- * of the passwd file. 
+ * Get the full local mailbox name.  This is in the form:
+ *
+ * User Name <user@name.com>
+ */
+
+char *
+getlocalmbox (void)
+{
+    if (username[0] == '\0')
+       getuserinfo();
+
+    return localmbox;
+}
+
+/*
+ * Find and cache the user's username, full name, and local mbox.

  */
 
 static void
 getuserinfo (void)
 {
  */
 
 static void
 getuserinfo (void)
 {

-    register unsigned char *cp;
-    register char *np;
-    register struct passwd *pw;
+    char *cp, *np;
+    struct passwd *pw;

 
     if ((pw = getpwuid (getuid ())) == NULL
            || pw->pw_name == NULL
 
     if ((pw = getpwuid (getuid ())) == NULL
            || pw->pw_name == NULL


@@ -373,90 +370,81 @@ getuserinfo (void)
        return;
     }
 
        return;
     }
 

+    /* username */
+    if (username[0] == '\0') {
+       strncpy (username, pw->pw_name, sizeof(username));
+    }
+    username[sizeof(username) - 1] = '\0';
+
+    /* fullname */

     np = pw->pw_gecos;
 
     /* Get the user's real name from the GECOS field.  Stop once we hit a ',',
        which some OSes use to separate other 'finger' information in the GECOS
     np = pw->pw_gecos;
 
     /* Get the user's real name from the GECOS field.  Stop once we hit a ',',
        which some OSes use to separate other 'finger' information in the GECOS

-       field, like phone number.  Also, if mmailid masquerading is turned on due
-       to "mmailid" appearing on the "masquerade:" line of mts.conf, stop if we
-       hit a '<' (which should precede any ','s). */
-    if (mmailid_masquerading)
-       /* Stop at ',' or '<'. */
-       for (cp = fullname; *np != '\0' && *np != ',' && *np != '<';
-            *cp++ = *np++)
-           continue;
-    else
-       /* Allow '<' as a legal character of the user's name.  This code is
-          basically a duplicate of the code above the "else" -- we don't
-          collapse it down to one copy and put the mmailid_masquerading check
-          inside the loop with "(x ? y : z)" because that's inefficient and the
-          value'll never change while it's in there. */
-       for (cp = fullname; *np != '\0' && *np != ',';
-            *cp++ = *np++)
-           continue;
+       field, like phone number. */
+    for (cp = fullname; *np != '\0' && *np != ','; *cp++ = *np++)
+       continue;

     *cp = '\0';
 
     *cp = '\0';
 

-    if (mmailid_masquerading) {
-       /* Do mmailid processing.  The GECOS field should have the form
-          "Full Name <fakeusername>".  For instance,
-          "Dan Harkless <Dan.Harkless>".  Naturally, you'll want your MTA to
-          have an alias (e.g. in /etc/aliases) from "fakeusername" to your
-          account name.  */ 
-       if (*np)
-           np++;
-       for (cp = username; *np && *np != '>'; *cp++ = *np++)
-           continue;
-       *cp = '\0';
-    }
-    if (!mmailid_masquerading || *np == '\0')
-       strncpy (username, pw->pw_name, sizeof(username));
-

     /* The $SIGNATURE environment variable overrides the GECOS field's idea of
        your real name. If SIGNATURE isn't set, use the Signature profile
     /* The $SIGNATURE environment variable overrides the GECOS field's idea of
        your real name. If SIGNATURE isn't set, use the Signature profile

-       setting if it exists. */
+       setting if it exists.
+       Note that post(8) uses context_foil(), so it won't see the profile
+       component. */

     if ((cp = getenv ("SIGNATURE")) && *cp)
        strncpy (fullname, cp, sizeof(fullname));
     else if ((cp = context_find("Signature")))
     if ((cp = getenv ("SIGNATURE")) && *cp)
        strncpy (fullname, cp, sizeof(fullname));
     else if ((cp = context_find("Signature")))

-       strncpy (fullname, cp, sizeof(fullname));
-
-    if (strchr(fullname, '.')) {               /*  quote any .'s */
-       char tmp[BUFSIZ];
-
-       /* should quote "'s too */
-       snprintf (tmp, sizeof(tmp), "\"%s\"", fullname);
-       strncpy (fullname, tmp, sizeof(fullname));
-    }
-
+       strncpy (fullname, cp, sizeof(fullname));

     fullname[sizeof(fullname) - 1] = '\0';
     fullname[sizeof(fullname) - 1] = '\0';

-
-    return;
-}
-
-static const char*
-get_mtsconf_pathname (void)
-{
-    const char *cp = getenv ( "MHMTSCONF" );
-    if (cp != NULL && *cp != '\0') {
-        return cp;
+    escape_display_name(fullname, sizeof(fullname));
+
+    /* localmbox and mboxname */
+    /* If there's a Local-Mailbox profile component, try to extract
+       the username from it.  But don't try very hard, this assumes
+       the very simple User Name <user@name.com> form.
+       Note that post(8) uses context_foil(), so it won't see the profile
+       component. */
+    if ((np = context_find("Local-Mailbox")) != NULL) {
+       char *left_angle_bracket = strchr (np, '<');
+       char *at_sign = strchr (np, '@');
+       char *right_angle_bracket = strchr (np, '>');
+
+       strncpy(localmbox, np, sizeof(localmbox) - 1);
+
+       if (left_angle_bracket  &&  at_sign  &&  right_angle_bracket) {
+           if (at_sign > left_angle_bracket  &&
+               at_sign - left_angle_bracket < BUFSIZ) {
+               strncpy(mboxname, left_angle_bracket + 1,
+                       at_sign - left_angle_bracket - 1);
+           }
+       }
+    } else {
+       snprintf(localmbox, sizeof(localmbox), "%s <%s@%s>", fullname,
+                username, LocalName(0));

     }
     }

-    return mtsconf;
+    localmbox[sizeof(localmbox) - 1] = '\0';
+    if (mboxname[0] == '\0') {
+       strncpy (mboxname, username, sizeof(mboxname));
+    }
+    mboxname[sizeof(mboxname) - 1] = '\0';
+    escape_local_part(mboxname, sizeof(mboxname));

 }
 
 }
 

-static const char*
-get_mtsuserconf_pathname (void)
+
+static const char *
+get_optional_env_var(const char *name, const char *fallback)

 {
 {

-    const char *cp = getenv ( "MHMTSUSERCONF" );
-    if (cp != NULL && *cp != '\0') {
-        return cp;
-    }
-    return NULL;
+    const char *v = getenv(name);
+    if (v)
+        return v;
+    return fallback;

 }
 
 }
 

+

 static void
 mts_read_conf_file (FILE *fp)
 {
 static void
 mts_read_conf_file (FILE *fp)
 {

-    unsigned char *bp;
-    char *cp, buffer[BUFSIZ];
+    char *bp, *cp, buffer[BUFSIZ];

     struct bind *b;
 
     while (fgets (buffer, sizeof(buffer), fp)) {
     struct bind *b;
 
     while (fgets (buffer, sizeof(buffer), fp)) {


@@ -468,7 +456,7 @@ mts_read_conf_file (FILE *fp)
        if (!(bp = strchr(buffer, ':')))
            break;
        *bp++ = 0;
        if (!(bp = strchr(buffer, ':')))
            break;
        *bp++ = 0;

-       while (isspace (*bp))
+       while (isspace ((unsigned char) *bp))

            *bp++ = 0;
 
        for (b = binds; b->keyword; b++)
            *bp++ = 0;
 
        for (b = binds; b->keyword; b++)