/*
* 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.
#include <h/mh.h> /* for snprintf() */
#include <h/nmh.h>
+#include <h/utils.h>
#define nmhetcdir(file) NMHETCDIR#file
#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
* MTS specific variables
*/
#if defined(SMTPMTS)
-static char *sm_method = "smtp";
-int sm_mts = MTS_SMTP;
-char *hostable = nmhetcdir(/hosts);
+static char *sm_method = "sendmail";
+int sm_mts = MTS_SENDMAIL;
char *sendmail = SENDMAILPATH;
#endif
/*
- * SMTP/POP stuff
+ * SMTP stuff
*/
char *clientname = NULL;
-char *servers = "localhost \01localnet";
-char *pophost = "";
-
-/*
- * BBoards-specific variables
- */
-char *bb_domain = "";
-
-
-/*
- * POP BBoards-specific variables
- */
-#ifdef BPOP
-char *popbbhost = "";
-char *popbbuser = "";
-char *popbblist = nmhetcdir(/hosts.popbb);
-#endif /* BPOP */
/*
* Global MailDelivery file
#if defined(SMTPMTS)
{ "mts", &sm_method },
- { "hostable", &hostable },
{ "sendmail", &sendmail },
#endif
{ "clientname", &clientname },
- { "servers", &servers },
- { "pophost", &pophost },
- { "bbdomain", &bb_domain },
-
-#ifdef BPOP
- { "popbbhost", &popbbhost },
- { "popbbuser", &popbbuser },
- { "popbblist", &popbblist },
-#endif
-
-#ifdef NNTP
- { "nntphost", &popbbhost },
-#endif
{ "maildelivery", &maildelivery },
{ "everyone", &everyone },
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)
if (strstr(masquerade, "username_extension") != NULL)
username_extension_masquerading = TRUE;
-
-#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
}
*/
static char *
-tailor_value (char *s)
+tailor_value (unsigned char *s)
{
int i, r;
char *bp;
*bp = 0;
len = strlen (buffer) + 1;
- if ((bp = malloc (len)))
- memcpy (bp, buffer, len);
+ bp = mh_xmalloc (len);
+ memcpy (bp, buffer, len);
return bp;
}
LocalName (void)
{
static char buffer[BUFSIZ] = "";
- struct hostent *hp;
-
+ struct addrinfo hints, *res;
#ifdef HAVE_UNAME
struct utsname name;
#endif
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);
+ }
}
/*
static void
getuserinfo (void)
{
- register char *cp, *np;
+ register unsigned char *cp;
+ register char *np;
register struct passwd *pw;
-#ifdef KPOP
- uid_t uid;
-
- uid = getuid ();
- if (uid == geteuid () && (cp = getenv ("USER")) != NULL
- && (pw = getpwnam (cp)) != NULL)
- strncpy (username, cp, sizeof(username));
- else if ((pw = getpwuid (uid)) == NULL
- || pw->pw_name == NULL
- || *pw->pw_name == '\0') {
-#else /* KPOP */
if ((pw = getpwuid (getuid ())) == NULL
|| pw->pw_name == NULL
|| *pw->pw_name == '\0') {
-#endif /* KPOP */
strncpy (username, "unknown", sizeof(username));
snprintf (fullname, sizeof(fullname), "The Unknown User-ID (%d)",
(int) getuid ());
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;
+ }
+}
projects / mmh / blobdiff