#include <h/mh.h> /* for snprintf() */
#include <h/nmh.h>
#include <h/utils.h>
-
-#define nmhetcdir(file) NMHETCDIR#file
-
#include <ctype.h>
#include <stdio.h>
#include <h/mts.h>
/*
** static prototypes
*/
-static char *tailor_value (unsigned char *);
-static void getuserinfo (void);
+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
-** are kept in the user's home directory, then these should be empty
-** strings. In this case, the appropriate ...lfil array should contain
-** the name of the file in the user's home directory. Usually, this is
-** something like ".mail".
-*/
+static void mts_read_conf_file(FILE *fp);
/*
** nmh mail transport interface customization file
*/
-static char *mtsconf = nmhetcdir(/mts.conf);
+static char *mtsconf = NMHETCDIR"/mts.conf";
-char *mmdfldir = MAILSPOOL;
-char *mmdflfil = "";
-char *uucpldir = "/usr/spool/mail";
-char *uucplfil = "";
-
-char *mmdlm1 = "\001\001\001\001\n";
-char *mmdlm2 = "\001\001\001\001\n";
/* Cache the username and fullname of the user */
static char username[BUFSIZ];
static char fullname[BUFSIZ];
-/* Variables for username masquerading: */
-boolean draft_from_masquerading = FALSE;
-static boolean mmailid_masquerading = FALSE;
-boolean username_extension_masquerading = FALSE; /* " from addrsbr.c */
-static char* masquerade = "";
-
/*
** Global MailDelivery file
*/
-char *maildelivery = nmhetcdir(/maildelivery);
-
-
-/*
-** Aliasing Facility (doesn't belong here)
-*/
-int Everyone = NOTOK;
-static char *everyone = "-1";
-char *NoShell = "";
+char *maildelivery = NMHETCDIR"/maildelivery";
/*
** Customize the MTS settings for nmh by adjusting
};
static struct bind binds[] = {
- { "mmdfldir", &mmdfldir },
- { "mmdflfil", &mmdflfil },
- { "uucpldir", &uucpldir },
- { "uucplfil", &uucplfil },
- { "mmdelim1", &mmdlm1 },
- { "mmdelim2", &mmdlm2 },
- { "masquerade", &masquerade },
{ "maildelivery", &maildelivery },
- { "everyone", &everyone },
- { "noshell", &NoShell },
{ NULL, NULL }
};
*/
void
-mts_init (char *name)
+mts_init(char *name)
{
const char *cp;
FILE *fp;
static int inited = 0;
- if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
+ if (inited++ || (fp = fopen(get_mtsconf_pathname(), "r")) == NULL)
return;
mts_read_conf_file(fp);
- fclose (fp);
+ fclose(fp);
cp = get_mtsuserconf_pathname();
if (cp != NULL &&
- ((fp = fopen (get_mtsuserconf_pathname(), "r")) != 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)
- draft_from_masquerading = TRUE;
-
- if (strstr(masquerade, "mmailid") != NULL)
- mmailid_masquerading = TRUE;
-
- if (strstr(masquerade, "username_extension") != NULL)
- username_extension_masquerading = TRUE;
}
*/
static char *
-tailor_value (unsigned char *s)
+tailor_value(unsigned char *s)
{
int i, r;
char *bp;
*bp = *s;
} else {
switch (*++s) {
- case 'b': *bp = '\b'; break;
- case 'f': *bp = '\f'; break;
- case 'n': *bp = '\n'; break;
- case 't': *bp = '\t'; break;
-
- case 0: s--;
- case QUOTE:
- *bp = QUOTE;
- break;
-
- default:
- if (!isdigit (*s)) {
- *bp++ = QUOTE;
- *bp = *s;
- }
- r = *s != '0' ? 10 : 8;
- for (i = 0; isdigit (*s); s++)
- i = i * r + *s - '0';
- s--;
- *bp = toascii (i);
- break;
+ case 'b': *bp = '\b'; break;
+ case 'f': *bp = '\f'; break;
+ case 'n': *bp = '\n'; break;
+ case 't': *bp = '\t'; break;
+
+ case 0: s--;
+ case QUOTE:
+ *bp = QUOTE;
+ break;
+
+ default:
+ if (!isdigit(*s)) {
+ *bp++ = QUOTE;
+ *bp = *s;
+ }
+ r = *s != '0' ? 10 : 8;
+ for (i = 0; isdigit(*s); s++)
+ i = i * r + *s - '0';
+ s--;
+ *bp = toascii(i);
+ break;
}
}
}
*bp = 0;
- len = strlen (buffer) + 1;
- bp = mh_xmalloc (len);
- memcpy (bp, buffer, len);
+ len = strlen(buffer) + 1;
+ bp = mh_xmalloc(len);
+ memcpy(bp, buffer, len);
return bp;
}
*/
char *
-LocalName (void)
+LocalName(void)
{
static char buffer[BUFSIZ] = "";
struct addrinfo hints, *res;
if (buffer[0])
return buffer;
- mts_init ("mts");
+ mts_init("mts");
memset(buffer, 0, sizeof(buffer));
#ifdef HAVE_UNAME
/* first get our local name */
- uname (&name);
- strncpy (buffer, name.nodename, sizeof(buffer) - 1);
+ uname(&name);
+ strncpy(buffer, name.nodename, sizeof(buffer) - 1);
#else
/* first get our local name */
- gethostname (buffer, sizeof(buffer) - 1);
+ gethostname(buffer, sizeof(buffer) - 1);
#endif
/* now fully qualify our name */
*/
char *
-SystemName (void)
+SystemName(void)
{
static char buffer[BUFSIZ] = "";
if (buffer[0])
return buffer;
- mts_init ("mts");
+ mts_init("mts");
#ifdef HAVE_UNAME
- uname (&name);
- strncpy (buffer, name.nodename, sizeof(buffer));
+ uname(&name);
+ strncpy(buffer, name.nodename, sizeof(buffer));
#else
- gethostname (buffer, sizeof(buffer));
+ gethostname(buffer, sizeof(buffer));
#endif
return buffer;
*/
char *
-getusername (void)
+getusername(void)
{
if (username[0] == '\0')
getuserinfo();
*/
char *
-getfullname (void)
+getfullname(void)
{
if (username[0] == '\0')
getuserinfo();
/*
** 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.
*/
-
static void
-getuserinfo (void)
+getuserinfo(void)
{
register unsigned char *cp;
register char *np;
register struct passwd *pw;
- if ((pw = getpwuid (getuid ())) == NULL
+ if ((pw = getpwuid(getuid())) == NULL
|| pw->pw_name == NULL
|| *pw->pw_name == '\0') {
- strncpy (username, "unknown", sizeof(username));
- snprintf (fullname, sizeof(fullname), "The Unknown User-ID (%d)",
- (int) getuid ());
+ strncpy(username, "unknown", sizeof(username));
+ snprintf(fullname, sizeof(fullname), "The Unknown User-ID (%d)",
+ (int) getuid());
return;
}
/*
** 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).
+ ** information in the GECOS field, like phone number.
*/
+ for (cp = fullname; *np != '\0' && *np != ',';) {
#ifndef BSD42
- 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;
+ *cp++ = *np++;
#else /* BSD42 */
- /*
- ** On BSD(-derived) systems, the system utilities that deal with
- ** the GECOS field (finger, mail, sendmail, etc.) translate
- ** any '&' character in it to the login name, with the first
- ** letter capitalized. So, for instance, fingering a user "bob"
- ** with the GECOS field "& Jones" would reveal him to be "In real
- ** life: Bob Jones". Surprisingly, though, the OS doesn't do the
- ** translation for you, so we have to do it manually here.
- */
- if (mmailid_masquerading)
- /* Stop at ',' or '<'. */
- for (cp = fullname;
- *np != '\0' && *np != ',' && *np != '<';) {
- if (*np == '&') { /* blech! */
- strcpy (cp, pw->pw_name);
- *cp = toupper(*cp);
- while (*cp)
- cp++;
- np++;
- } else {
- *cp++ = *np++;
- }
- }
- 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.
+ ** On BSD(-derived) systems, the system utilities that
+ ** deal with the GECOS field (finger, mail, sendmail,
+ ** etc.) translate any '&' character in it to the login name,
+ ** with the first letter capitalized. So, for instance,
+ ** fingering a user "bob" with the GECOS field "& Jones"
+ ** would reveal him to be "In real life: Bob Jones".
+ ** Surprisingly, though, the OS doesn't do the translation
+ ** for you, so we have to do it manually here.
*/
- for (cp = fullname; *np != '\0' && *np != ',';) {
- if (*np == '&') { /* blech! */
- strcpy (cp, pw->pw_name);
- *cp = toupper(*cp);
- while (*cp)
- cp++;
- np++;
- } else {
- *cp++ = *np++;
- }
+ if (*np == '&') { /* blech! */
+ strcpy(cp, pw->pw_name);
+ *cp = toupper(*cp);
+ while (*cp)
+ cp++;
+ np++;
+ } else {
+ *cp++ = *np++;
}
#endif /* BSD42 */
- *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));
+ *cp = '\0';
+ strncpy(username, pw->pw_name, sizeof(username));
/*
** The $SIGNATURE environment variable overrides the GECOS field's
** idea of your real name.
*/
- if ((cp = getenv ("SIGNATURE")) && *cp)
- strncpy (fullname, cp, sizeof(fullname));
+ if ((cp = getenv("SIGNATURE")) && *cp)
+ 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));
+ snprintf(tmp, sizeof(tmp), "\"%s\"", fullname);
+ strncpy(fullname, tmp, sizeof(fullname));
}
return;
}
static const char*
-get_mtsconf_pathname (void)
+get_mtsconf_pathname(void)
{
- const char *cp = getenv ( "MHMTSCONF ");
+ const char *cp = getenv( "MHMTSCONF ");
if (cp != NULL && *cp != '\0') {
return cp;
}
}
static const char*
-get_mtsuserconf_pathname (void)
+get_mtsuserconf_pathname(void)
{
- const char *cp = getenv ( "MHMTSUSERCONF" );
+ const char *cp = getenv( "MHMTSUSERCONF" );
if (cp != NULL && *cp != '\0') {
return cp;
}
}
static void
-mts_read_conf_file (FILE *fp)
+mts_read_conf_file(FILE *fp)
{
unsigned char *bp;
char *cp, buffer[BUFSIZ];
struct bind *b;
- while (fgets (buffer, sizeof(buffer), fp)) {
+ while (fgets(buffer, sizeof(buffer), fp)) {
if (!(cp = strchr(buffer, '\n')))
break;
*cp = 0;
if (!(bp = strchr(buffer, ':')))
break;
*bp++ = 0;
- while (isspace (*bp))
+ while (isspace(*bp))
*bp++ = 0;
for (b = binds; b->keyword; b++)
- if (!strcmp (buffer, b->keyword))
+ if (strcmp(buffer, b->keyword)==0)
break;
- if (b->keyword && (cp = tailor_value (bp)))
+ if (b->keyword && (cp = tailor_value(bp)))
*b->value = cp;
}
}
projects / mmh / blobdiff