X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmts.c;h=b52740df5608ca25aa02e9a32551f9806a192fc3;hp=ced0cf73e4d4a4ade5d5838077fcfb1f735a6a69;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=f61367c1118de22149e1ddff4a2c2c2437d758f0 diff --git a/sbr/mts.c b/sbr/mts.c index ced0cf7..b52740d 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -7,186 +7,42 @@ */ #include /* for snprintf() */ -#include #include #include #include -#include #include +#include #include - -#ifdef HAVE_SYS_UTSNAME_H -# include -#endif - -#define NOTOK (-1) -#define OK 0 +#include /* ** static prototypes */ -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); - -/* -** nmh mail transport interface customization file -*/ -static char *mtsconf = NMHETCDIR"/mts.conf"; - /* 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"; - -/* -** Customize the MTS settings for nmh by adjusting -** the file mts.conf in the nmh etc directory. -*/ - -struct bind { - char *keyword; - char **value; -}; - -static struct bind binds[] = { - { "masquerade", &masquerade }, - { "maildelivery", &maildelivery }, - { NULL, NULL } -}; - - -/* -** Read the configuration file for the nmh interface -** to the mail transport system (MTS). -*/ - -void -mts_init(char *name) -{ - const char *cp; - FILE *fp; - static int inited = 0; - - 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); - } - - 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; -} - - -#define QUOTE '\\' - -/* -** Convert escaped values, malloc some new space, -** and copy string to malloc'ed memory. -*/ - -static char * -tailor_value(unsigned char *s) -{ - int i, r; - char *bp; - char buffer[BUFSIZ]; - size_t len; - - for (bp = buffer; *s; bp++, s++) { - if (*s != QUOTE) { - *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; - } - } - } - *bp = 0; - - len = strlen(buffer) + 1; - bp = mh_xmalloc(len); - memcpy(bp, buffer, len); - - return bp; -} /* ** Get the fully qualified name of the local host. */ - char * LocalName(void) { static char buffer[BUFSIZ] = ""; struct addrinfo hints, *res; -#ifdef HAVE_UNAME - struct utsname name; -#endif /* check if we have cached the local name */ if (buffer[0]) return buffer; - 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); -#else /* first get our local name */ gethostname(buffer, sizeof(buffer) - 1); -#endif - /* now fully qualify our name */ + /* now fully qualify our name */ memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; hints.ai_family = PF_UNSPEC; @@ -200,40 +56,8 @@ LocalName(void) /* -** This is only for UUCP mail. It gets the hostname -** as part of the UUCP "domain". -*/ - -char * -SystemName(void) -{ - static char buffer[BUFSIZ] = ""; - -#ifdef HAVE_UNAME - struct utsname name; -#endif - - /* check if we have cached the system name */ - if (buffer[0]) - return buffer; - - mts_init("mts"); - -#ifdef HAVE_UNAME - uname(&name); - strncpy(buffer, name.nodename, sizeof(buffer)); -#else - gethostname(buffer, sizeof(buffer)); -#endif - - return buffer; -} - - -/* ** Get the username of current user */ - char * getusername(void) { @@ -248,7 +72,6 @@ getusername(void) ** Get full name of current user (typically from GECOS ** field of password file). */ - char * getfullname(void) { @@ -261,23 +84,21 @@ 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. */ - static void getuserinfo(void) { - register unsigned char *cp; - register char *np; - register struct passwd *pw; - - if ((pw = getpwuid(getuid())) == NULL - || pw->pw_name == NULL - || *pw->pw_name == '\0') { + unsigned char *cp; + char *np; + struct passwd *pw; + int needquotes = 0; + char tmp[BUFSIZ]; + char *tp; + + if (!(pw = getpwuid(getuid())) || !pw->pw_name || !*pw->pw_name) { strncpy(username, "unknown", sizeof(username)); - snprintf(fullname, sizeof(fullname), "The Unknown User-ID (%d)", - (int) getuid()); + snprintf(fullname, sizeof(fullname), + "The Unknown User-ID (%d)", (int)getuid()); return; } @@ -286,153 +107,49 @@ getuserinfo(void) /* ** 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). - */ -#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; -#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. + ** information in the GECOS field, like phone number. */ - 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. - */ - for (cp = fullname; *np != '\0' && *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 ". For instance, - ** "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'; + for (cp = tmp; *np != '\0' && *np != ',';) { + *cp++ = *np++; } - 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 (strchr(fullname, '.')) { /* quote any .'s */ - char tmp[BUFSIZ]; - - /* should quote "'s too */ - snprintf(tmp, sizeof(tmp), "\"%s\"", fullname); - strncpy(fullname, tmp, sizeof(fullname)); + strncpy(tmp, cp, sizeof(tmp)); + + /* quote the fullname as needed */ + needquotes = 0; + for (tp=tmp; *tp; tp++) { + switch (*tp) { + case '(': case ')': case '<': case '>': case '[': case ']': + case ':': case ';': case '@': case '\\': case ',': case '.': + case '"': /* cf. RFC 5322 */ + break; /* ... the switch */ + default: + continue; /* ... the loop */ + } + /* we've found a special char */ + needquotes = 1; + break; } - - return; -} - -static const char* -get_mtsconf_pathname(void) -{ - const char *cp = getenv( "MHMTSCONF "); - if (cp != NULL && *cp != '\0') { - return cp; + cp=fullname; + if (needquotes) { + *cp++ = '"'; } - return mtsconf; -} - -static const char* -get_mtsuserconf_pathname(void) -{ - const char *cp = getenv( "MHMTSUSERCONF" ); - if (cp != NULL && *cp != '\0') { - return cp; + for (tp=tmp; *tp; *cp++=*tp++) { + if (*tp == '"') { + *cp++ = '\\'; /* prepend backslash */ + } } - 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)==0) - break; - if (b->keyword && (cp = tailor_value(bp))) - *b->value = cp; + if (needquotes) { + *cp++ = '"'; } + *cp = '\0'; + + return; }