X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fmts.c;h=313cbbc43ddea07b821f4a3ac17d9422ea827eae;hb=b14ea6073f77b4359aaf3fddd0e105989db9f306;hp=a3ea0f812fddd66f98fbda1b75dd4bd551319d95;hpb=a0f6183a0f52f9c0f48ce42b4f10592ceec2b014;p=mmh diff --git a/sbr/mts.c b/sbr/mts.c index a3ea0f8..313cbbc 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -32,33 +32,16 @@ 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". -*/ - -/* ** nmh mail transport interface customization file */ 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 = ""; @@ -67,14 +50,6 @@ static char* masquerade = ""; */ 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. @@ -86,14 +61,8 @@ struct bind { }; static struct bind binds[] = { - { "mmdfldir", &mmdfldir }, - { "mmdflfil", &mmdflfil }, - { "uucpldir", &uucpldir }, - { "uucplfil", &uucplfil }, { "masquerade", &masquerade }, { "maildelivery", &maildelivery }, - { "everyone", &everyone }, - { "noshell", &NoShell }, { NULL, NULL } }; @@ -122,14 +91,6 @@ mts_init(char *name) 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; } @@ -292,10 +253,7 @@ 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) { @@ -317,91 +275,35 @@ 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). + ** 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 ". 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'; } - 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