*/
static char *mtsconf = nmhetcdir(/mts.conf);
-static char *localname = "";
-static char *localdomain = "";
-static char *systemname = "";
-
char *mmdfldir = MAILSPOOL;
char *mmdflfil = "";
char *uucpldir = "/usr/spool/mail";
static char fullname[BUFSIZ];
/* Variables for username masquerading: */
- boolean draft_from_masquerading = FALSE; /* also used from post.c */
+ boolean draft_from_masquerading = FALSE;
static boolean mmailid_masquerading = FALSE;
boolean username_extension_masquerading = FALSE; /* " from addrsbr.c */
static char* masquerade = "";
/*
- * MTS specific variables
- */
-#if defined(SMTPMTS)
-static char *sm_method = "smtp";
-int sm_mts = MTS_SMTP;
-char *hostable = nmhetcdir(/hosts);
-char *sendmail = SENDMAILPATH;
-#endif
-
-/*
- * SMTP/POP stuff
- */
-char *clientname = NULL;
-char *servers = "localhost \01localnet";
-char *pophost = "";
-
-/*
* Global MailDelivery file
*/
char *maildelivery = nmhetcdir(/maildelivery);
};
static struct bind binds[] = {
- { "localname", &localname },
- { "localdomain", &localdomain },
- { "systemname", &systemname },
{ "mmdfldir", &mmdfldir },
{ "mmdflfil", &mmdflfil },
{ "uucpldir", &uucpldir },
{ "mmdelim1", &mmdlm1 },
{ "mmdelim2", &mmdlm2 },
{ "masquerade", &masquerade },
-
-#if defined(SMTPMTS)
- { "mts", &sm_method },
- { "hostable", &hostable },
- { "sendmail", &sendmail },
-#endif
-
- { "clientname", &clientname },
- { "servers", &servers },
- { "pophost", &pophost },
-
{ "maildelivery", &maildelivery },
{ "everyone", &everyone },
{ "noshell", &NoShell },
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
}
mts_init ("mts");
- /* check if the mts.conf file specifies a "localname" */
- if (*localname) {
- strncpy (buffer, localname, sizeof(buffer));
- } else {
- memset(buffer, 0, sizeof(buffer));
+ memset(buffer, 0, sizeof(buffer));
#ifdef HAVE_UNAME
- /* first get our local name */
- uname (&name);
- strncpy (buffer, name.nodename, sizeof(buffer) - 1);
+ /* 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);
+ /* first get our local name */
+ gethostname (buffer, sizeof(buffer) - 1);
#endif
- /* 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);
- freeaddrinfo(res);
- }
- }
-
- /*
- * If the mts.conf file specifies a "localdomain",
- * we append that now. This should rarely be needed.
- */
- if (*localdomain) {
- strcat (buffer, ".");
- strcat (buffer, localdomain);
+ /* 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);
+ freeaddrinfo(res);
}
return buffer;
mts_init ("mts");
- /* check if mts.conf file specifies a "systemname" */
- if (*systemname) {
- strncpy (buffer, systemname, sizeof(buffer));
- return buffer;
- }
-
#ifdef HAVE_UNAME
uname (&name);
strncpy (buffer, name.nodename, sizeof(buffer));