#include <sys/socket.h>
#include <netdb.h>
-#define NOTOK (-1)
-#define OK 0
-
/*
* static prototypes
*/
* SMTP/POP stuff
*/
char *clientname = NULL;
-char *servers = "localhost \01localnet";
+char *servers = "localhost";
char *pophost = "";
/*
void
mts_init (char *name)
{
+ NMH_UNUSED (name);
+
const char *cp;
FILE *fp;
static int inited = 0;
/*
* Get the fully qualified name of the local host.
+ *
+ * If flag is 0, then use anything out of mts.conf (like localname).
+ * If flag is 1, then only use the "proper" local hostname.
*/
char *
-LocalName (void)
+LocalName (int flag)
{
- static char buffer[BUFSIZ] = "";
+ static char buffer0[BUFSIZ] = "";
+ static char buffer1[BUFSIZ] = "";
+ static char *buffer[] = { buffer0, buffer1 };
+ char *buf;
struct addrinfo hints, *res;
+ if (flag < 0 || flag > 1)
+ return NULL;
+
+ buf = buffer[flag];
+
/* check if we have cached the local name */
- if (buffer[0])
- return buffer;
+ if (buf[0])
+ return buf;
mts_init ("mts");
/* check if the mts.conf file specifies a "localname" */
- if (*localname) {
- strncpy (buffer, localname, sizeof(buffer));
+ if (*localname && flag == 0) {
+ strncpy (buf, localname, sizeof(buffer0));
} else {
- memset(buffer, 0, sizeof(buffer));
+ memset(buf, 0, sizeof(buffer0));
/* first get our local name */
- gethostname (buffer, sizeof(buffer) - 1);
+ gethostname (buf, sizeof(buffer0) - 1);
/* now fully qualify our name */
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);
+ if (getaddrinfo(buf, NULL, &hints, &res) == 0) {
+ strncpy(buf, res->ai_canonname, sizeof(buffer0) - 1);
freeaddrinfo(res);
}
}
* we append that now. This should rarely be needed.
*/
if (*localdomain) {
- strcat (buffer, ".");
- strcat (buffer, localdomain);
+ strcat (buf, ".");
+ strcat (buf, localdomain);
}
- return buffer;
+ return buf;
}
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 != '<';
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. */
- 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) {
strncpy (username, pw->pw_name, sizeof(username));
/* The $SIGNATURE environment variable overrides the GECOS field's idea of
- your real name. */
+ your real name. If SIGNATURE isn't set, use the Signature profile
+ setting if it exists. */
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];
strncpy (fullname, tmp, sizeof(fullname));
}
+ fullname[sizeof(fullname) - 1] = '\0';
+
return;
}
static const char*
get_mtsconf_pathname (void)
{
- const char *cp = getenv ( "MHMTSCONF ");
+ const char *cp = getenv ( "MHMTSCONF" );
if (cp != NULL && *cp != '\0') {
return cp;
}