#include <h/scansbr.h>
#include <h/signals.h>
#include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
#include <errno.h>
#include <signal.h>
int chgflag = 1, trnflag = 1;
int noisy = 1, width = 0;
int rpop, i, hghnum, msgnum;
- int kpop = 0;
+ int kpop = 0, sasl = 0;
char *cp, *maildir, *folder = NULL;
char *format = NULL, *form = NULL;
char *host = NULL, *user = NULL;
- char *audfile = NULL, *from = NULL;
+ char *audfile = NULL, *from = NULL, *saslmech = NULL;
char buf[BUFSIZ], **argp, *nfs, **arguments;
struct msgs *mp;
struct stat st, s1;
#ifdef POP
int nmsgs, nbytes, p = 0;
char *pass = NULL;
+ char *MAILHOST_env_variable;
#endif
#ifdef MHE
#ifdef HESIOD
struct hes_postoffice *po;
- char *tmphost;
#endif
/* absolutely the first thing we do is save our privileges,
argp = arguments;
#ifdef POP
-# ifdef HESIOD
/*
* Scheme is:
* use MAILHOST environment variable if present,
* If that fails, use the default (if any)
* provided by mts.conf in mts_init()
*/
- if ((tmphost = getenv("MAILHOST")) != NULL)
- pophost = tmphost;
+ if ((MAILHOST_env_variable = getenv("MAILHOST")) != NULL)
+ pophost = MAILHOST_env_variable;
+# ifdef HESIOD
else if ((po = hes_getmailhost(getusername())) != NULL &&
strcmp(po->po_type, "POP") == 0)
pophost = po->po_host;