projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test suite for "post"; uses fakesmtp to trap the SMTP protocol.
[mmh]
/
sbr
/
mts.c
diff --git
a/sbr/mts.c
b/sbr/mts.c
index
d298c88
..
ba7ff07
100644
(file)
--- a/
sbr/mts.c
+++ b/
sbr/mts.c
@@
-68,12
+68,10
@@
static char* masquerade = "";
/*
* MTS specific variables
*/
/*
* MTS specific variables
*/
-#if defined(SMTPMTS)
static char *sm_method = "smtp";
int sm_mts = MTS_SMTP;
char *hostable = nmhetcdir(/hosts);
char *sendmail = SENDMAILPATH;
static char *sm_method = "smtp";
int sm_mts = MTS_SMTP;
char *hostable = nmhetcdir(/hosts);
char *sendmail = SENDMAILPATH;
-#endif
/*
* SMTP/POP stuff
/*
* SMTP/POP stuff
@@
-116,13
+114,9
@@
static struct bind binds[] = {
{ "mmdelim1", &mmdlm1 },
{ "mmdelim2", &mmdlm2 },
{ "masquerade", &masquerade },
{ "mmdelim1", &mmdlm1 },
{ "mmdelim2", &mmdlm2 },
{ "masquerade", &masquerade },
-
-#if defined(SMTPMTS)
{ "mts", &sm_method },
{ "hostable", &hostable },
{ "sendmail", &sendmail },
{ "mts", &sm_method },
{ "hostable", &hostable },
{ "sendmail", &sendmail },
-#endif
-
{ "clientname", &clientname },
{ "servers", &servers },
{ "pophost", &pophost },
{ "clientname", &clientname },
{ "servers", &servers },
{ "pophost", &pophost },
@@
-171,7
+165,6
@@
mts_init (char *name)
if (strstr(masquerade, "username_extension") != NULL)
username_extension_masquerading = TRUE;
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)
if (strcmp(sm_method, "smtp") == 0)
sm_mts = MTS_SMTP;
else if (strcmp(sm_method, "sendmail") == 0)
@@
-180,7
+173,6
@@
mts_init (char *name)
advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
sm_mts = MTS_SMTP;
}
advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
sm_mts = MTS_SMTP;
}
-#endif
}
}