#include <h/utils.h>
#include <fcntl.h>
-#ifdef POP
-# include <h/dropsbr.h>
-# include <h/popsbr.h>
-#endif
-
+#include <h/dropsbr.h>
+#include <h/popsbr.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/signals.h>
#include <errno.h>
#include <signal.h>
-#ifndef POP
-# define POPminc(a) (a)
-#else
-# define POPminc(a) 0
-#endif
-
#ifndef CYRUS_SASL
# define SASLminc(a) (a)
#else
#define FMTSW 6
{ "format string", 5 },
#define HOSTSW 7
- { "host hostname", POPminc (-4) },
+ { "host hostname", 0 },
#define USERSW 8
- { "user username", POPminc (-4) },
+ { "user username", 0 },
#define PACKSW 9
- { "pack file", POPminc (-4) },
+ { "pack file", 0},
#define NPACKSW 10
- { "nopack", POPminc (-6) },
+ { "nopack", 0 },
#define PORTSW 11
- { "port name/number", POPminc (-4) },
+ { "port name/number", 0 },
#define SILSW 12
{ "silent", 0 },
#define NSILSW 13
{ "snoop", -5 },
#define SASLSW 20
{ "sasl", SASLminc(-4) },
-#define SASLMECHSW 21
+#define NOSASLSW 21
+ { "nosasl", SASLminc(-6) },
+#define SASLMECHSW 22
{ "saslmech", SASLminc(-8) },
-#define PROXYSW 22
- { "proxy command", POPminc(-5) },
+#define PROXYSW 23
+ { "proxy command", 0 },
{ NULL, 0 }
};
static int num_maildir_entries = 0;
static int snoop = 0;
-#ifdef POP
extern char response[];
static int size;
static int mbx_style = MMDF_FORMAT;
static int pd = NOTOK;
-#endif /* POP */
static long start;
static long stop;
* privilege ops into macros.
* *GROUPPRIVS() is related to handling the setgid MAIL property,
* and only applies if MAILGROUP is defined.
- * *USERPRIVS() is related to handling the setuid root property,
- * and only applies if POP is defined [why does POP => setuid root?]
* Basically, SAVEGROUPPRIVS() is called right at the top of main()
* to initialise things, and then DROPGROUPPRIVS() and GETGROUPPRIVS()
- * do the obvious thing. TRYDROPGROUPPRIVS() has to be safe to call
- * before DROPUSERPRIVS() is called [this is needed because setgid()
- * sets both effective and real uids if euid is root.]
+ * do the obvious thing.
*
* There's probably a better implementation if we're allowed to use
* BSD-style setreuid() rather than using POSIX saved-ids.
*/
#ifdef MAILGROUP
static int return_gid;
-#ifndef POP
-/* easy case; we're not setuid root, so can drop group privs
- * immediately.
- */
#define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()
-#else /* POP ie we are setuid root */
-#define TRYDROPGROUPPRIVS() \
-if (geteuid() != 0) DROPGROUPPRIVS()
-#endif
#define DROPGROUPPRIVS() setgid(getgid())
#define GETGROUPPRIVS() setgid(return_gid)
#define SAVEGROUPPRIVS() return_gid = getegid()
char *map_name(char *);
static void inc_done(int) NORETURN;
-#ifdef POP
static int pop_action(char *);
static int pop_pack(char *);
static int map_count(void);
-#endif
int
maildir_srt(const void *va, const void *vb)
struct msgs *mp = NULL;
struct stat st, s1;
FILE *aud = NULL;
- char b[MAXPATHLEN + 1];
+ char b[PATH_MAX + 1];
char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
-#ifdef POP
int nmsgs, nbytes;
char *pass = NULL;
char *MAILHOST_env_variable;
-#endif
done=inc_done;
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
-#ifdef POP
/*
* Scheme is:
* use MAILHOST environment variable if present,
if (pophost && *pophost)
host = pophost;
- if ((cp = getenv ("MHPOPDEBUG")) && *cp)
- snoop++;
-#endif /* POP */
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
case HELPSW:
snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case AUDSW:
if (!(cp = *argp++) || *cp == '-')
continue;
case PORTSW:
- if (!(host = *argp++) || *port == '-')
+ if (!(port = *argp++) || *port == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
continue;
case PACKSW:
-#ifndef POP
- if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
-#else /* POP */
if (!(packfile = *argp++) || *packfile == '-')
adios (NULL, "missing argument to %s", argp[-2]);
-#endif /* POP */
continue;
case NPACKSW:
-#ifdef POP
packfile = NULL;
-#endif /* POP */
continue;
case SNOOPSW:
case SASLSW:
sasl++;
continue;
+ case NOSASLSW:
+ sasl = 0;
+ continue;
case SASLMECHSW:
if (!(saslmech = *argp++) || *saslmech == '-')
/* NOTE: above this point you should use TRYDROPGROUPPRIVS(),
* not DROPGROUPPRIVS().
*/
-#ifdef POP
if (host && !*host)
host = NULL;
-#endif /* POP */
/* guarantee dropping group priveleges; we might not have done so earlier */
DROPGROUPPRIVS();
*/
if (from)
inc_type = INC_FILE;
-#ifdef POP
else if (host)
inc_type = INC_POP;
-#endif
else
inc_type = INC_FILE;
-#ifdef POP
/*
* Are we getting the mail from
* a POP server?
adios (NULL, "no mail to incorporate");
}
}
-#endif /* POP */
/*
* We will get the mail from a file
newmail = cp;
}
-#ifdef POP
/* skip the folder setup */
if ((inc_type == INC_POP) && packfile)
goto go_to_it;
-#endif /* POP */
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (!(mp = folder_read (folder)))
adios (NULL, "unable to read folder %s", folder);
-#ifdef POP
go_to_it:
-#endif /* POP */
if (inc_type == INC_FILE && Maildir == NULL) {
if (access (newmail, W_OK) != NOTOK) {
else if (i == NOTOK)
chmod (audfile, m_gmprot ());
-#ifdef POP
fprintf (aud, from ? "<<inc>> %s -ms %s\n"
: host ? "<<inc>> %s -host %s -user %s\n"
: "<<inc>> %s\n",
dtimenow (0), from ? from : host, user);
-#else /* POP */
- fprintf (aud, from ? "<<inc>> %s -ms %s\n" : "<<inc>> %s\n",
- dtimenow (0), from);
-#endif /* POP */
}
/* Get new format string */
fflush (stdout);
}
-#ifdef POP
/*
* Get the mail from a POP server
*/
pd = NOTOK;
}
}
-#endif /* POP */
/*
* Get the mail from file (usually mail spool)
break;
}
-#if 0
- /* copy file from spool to tmp file */
- tmpfilenam = m_scratch ("", invo_name);
- if ((fd = creat (tmpfilenam, m_gmprot ())) == NOTOK)
- adios (tmpfilenam, "unable to create");
- chmod (tmpfilenam, m_gmprot ());
- if (!(in2 = fdopen (fd, "r+")))
- adios (tmpfilenam, "unable to access");
- cpymsg (in, in2);
-
- /* link message into folder */
- newmsg = folder_addmsg(mp, tmpfilenam);
-#endif
/* create scanline for new message */
switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
if (noisy)
fflush (stdout);
-#ifdef POP
if ((inc_type == INC_POP) && packfile)
done (0);
-#endif /* POP */
/*
* truncate file we are incorporating from
}
-#if 0
-
-/*
- * Copy message message from spool into
- * temporary file. Massage the "From " line
- * while copying.
- */
-
-cpymsg (FILE *in, FILE *out)
-{
- int state;
- char *tmpbuf, name[NAMESZ];
-
- for (;;) {
- state = m_getfld (state, name, tmpbuf, rlwidth, in);
- switch (state) {
- case FLD:
- case FLDPLUS:
- break;
- case BODY:
- break;
- case LENERR:
- case FMTERR:
- break;
- case FILEEOF:
- break;
- default:
- }
- }
-}
-#endif /* if 0 */
-
-
static void
inc_done (int status)
{
-#ifdef POP
if (packfile && pd != NOTOK)
mbx_close (packfile, pd);
-#endif /* POP */
if (locked)
{
GETGROUPPRIVS();
exit (status);
}
-#ifdef POP
static int
pop_action (char *s)
{
close (md);
return (d.d_id);
}
-#endif /* POP */
projects / mmh / blobdiff