diff options
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/spamd/Makefile | 4 | ||||
| -rw-r--r-- | libexec/spamd/gdcopy.c | 50 | ||||
| -rw-r--r-- | libexec/spamd/grey.c | 43 | ||||
| -rw-r--r-- | libexec/spamd/grey.h | 22 | ||||
| -rw-r--r-- | libexec/spamlogd/Makefile | 4 | ||||
| -rw-r--r-- | libexec/spamlogd/spamlogd.c | 6 |
6 files changed, 95 insertions, 34 deletions
diff --git a/libexec/spamd/Makefile b/libexec/spamd/Makefile index 0ac6f1923dc..01c94b30b34 100644 --- a/libexec/spamd/Makefile +++ b/libexec/spamd/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.9 2007/03/04 03:19:41 beck Exp $ +# $OpenBSD: Makefile,v 1.10 2013/08/21 16:13:29 millert Exp $ PROG= spamd -SRCS= spamd.c sdl.c grey.c sync.c +SRCS= spamd.c sdl.c gdcopy.c grey.c sync.c MAN= spamd.8 CFLAGS+= -Wall -Wstrict-prototypes diff --git a/libexec/spamd/gdcopy.c b/libexec/spamd/gdcopy.c new file mode 100644 index 00000000000..02016cf4b37 --- /dev/null +++ b/libexec/spamd/gdcopy.c @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2013 Todd C. Miller <Todd.Miller@courtesan.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <db.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include "grey.h" + +/* Fill in struct gdata from DBT, converting from obsolete format as needed. */ +int +gdcopyin(const void *v, struct gdata *gd) +{ + const DBT *dbd = v; + int rc = 0; + + if (dbd->size == sizeof(struct gdata)) { + /* Current grey data format. */ + memcpy(gd, dbd->data, sizeof(struct gdata)); + } else if (dbd->size == sizeof(struct ogdata)) { + /* Backwards compat for obsolete grey data format. */ + struct ogdata ogd; + memcpy(&ogd, dbd->data, sizeof(struct ogdata)); + gd->first = ogd.first; + gd->pass = ogd.pass; + gd->expire = ogd.expire; + gd->bcount = ogd.bcount; + gd->pcount = ogd.pcount; + } else { + /* Unsupported grey data format. */ + rc = -1; + } + return (rc); +} diff --git a/libexec/spamd/grey.c b/libexec/spamd/grey.c index b006ad88efb..cba04b50cdf 100644 --- a/libexec/spamd/grey.c +++ b/libexec/spamd/grey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grey.c,v 1.52 2012/10/02 15:26:17 okan Exp $ */ +/* $OpenBSD: grey.c,v 1.53 2013/08/21 16:13:29 millert Exp $ */ /* * Copyright (c) 2004-2006 Bob Beck. All rights reserved. @@ -540,7 +540,6 @@ do_changes(DB *db) int db_addrstate(DB *db, char *key) { - int i; DBT dbk, dbd; struct gdata gd; @@ -548,14 +547,18 @@ db_addrstate(DB *db, char *key) dbk.size = strlen(key); dbk.data = key; memset(&dbd, 0, sizeof(dbd)); - i = db->get(db, &dbk, &dbd, 0); - if (i == -1) - return (-1); - if (i) - /* not in the database */ + switch (db->get(db, &dbk, &dbd, 0)) { + case 1: + /* not found */ return (0); - memcpy(&gd, dbd.data, sizeof(gd)); - return gd.pcount == -1 ? 1 : 2; + case 0: + if (gdcopyin(&dbd, &gd) != -1) + return (gd.pcount == -1 ? 1 : 2); + /* FALLTHROUGH */ + default: + /* error */ + return (-1); + } } @@ -582,7 +585,7 @@ greyscan(char *dbname) memset(&dbd, 0, sizeof(dbd)); for (r = db->seq(db, &dbk, &dbd, R_FIRST); !r; r = db->seq(db, &dbk, &dbd, R_NEXT)) { - if ((dbk.size < 1) || dbd.size != sizeof(struct gdata)) { + if ((dbk.size < 1) || gdcopyin(&dbd, &gd) == -1) { syslog_r(LOG_ERR, &sdata, "bogus entry in spamd database"); goto bad; } @@ -597,7 +600,6 @@ greyscan(char *dbname) } memset(a, 0, asiz); memcpy(a, dbk.data, dbk.size); - memcpy(&gd, dbd.data, sizeof(gd)); if (gd.expire <= now && gd.pcount != -2) { /* get rid of entry */ if (queue_change(a, NULL, 0, DBC_DEL) == -1) @@ -719,7 +721,7 @@ twupdate(char *dbname, char *what, char *ip, char *source, char *expires) now = time(NULL); /* expiry times have to be in the future */ - expire = strtonum(expires, now, INT_MAX, NULL); + expire = strtonum(expires, now, sizeof(time_t) == sizeof(int) ? INT_MAX : LLONG_MAX, NULL); if (expire == 0) return(-1); @@ -766,13 +768,12 @@ twupdate(char *dbname, char *what, char *ip, char *source, char *expires) expires); } else { /* existing entry */ - if (dbd.size != sizeof(gd)) { + if (gdcopyin(&dbd, &gd) == -1) { /* whatever this is, it doesn't belong */ db->del(db, &dbk, 0); db->sync(db, 0); goto bad; } - memcpy(&gd, dbd.data, sizeof(gd)); if (spamtrap) { gd.pcount = -1; gd.bcount++; @@ -889,13 +890,12 @@ greyupdate(char *dbname, char *helo, char *ip, char *from, char *to, int sync, spamtrap ? "greytrap " : "", ip, from, to, helo); } else { /* existing entry */ - if (dbd.size != sizeof(gd)) { + if (gdcopyin(&dbd, &gd) == -1) { /* whatever this is, it doesn't belong */ db->del(db, &dbk, 0); db->sync(db, 0); goto bad; } - memcpy(&gd, dbd.data, sizeof(gd)); gd.bcount++; gd.pcount = spamtrap ? -1 : 0; if (gd.first + passtime < now) @@ -979,7 +979,7 @@ greyreader(void) sync = 1; if (grey == NULL) { syslog_r(LOG_ERR, &sdata, "No greylist pipe stream!\n"); - exit(1); + return (-1); } /* grab trap suffixes */ @@ -1140,10 +1140,11 @@ greywatcher(void) */ close(pfdev); setproctitle("(%s update)", PATH_SPAMD_DB); - greyreader(); - syslog_r(LOG_ERR, &sdata, "greyreader failed (%m)"); - /* NOTREACHED */ - _exit(1); + if (greyreader() == -1) { + syslog_r(LOG_ERR, &sdata, "greyreader failed (%m)"); + _exit(1); + } + _exit(0); } diff --git a/libexec/spamd/grey.h b/libexec/spamd/grey.h index c76e4e95297..19315da55cd 100644 --- a/libexec/spamd/grey.h +++ b/libexec/spamd/grey.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grey.h,v 1.9 2007/03/06 23:38:36 beck Exp $ */ +/* $OpenBSD: grey.h,v 1.10 2013/08/21 16:13:29 millert Exp $ */ /* * Copyright (c) 2004 Bob Beck. All rights reserved. @@ -27,13 +27,23 @@ #define DB_TRAP_INTERVAL 60 * 10 #define PATH_SPAMD_DB "/var/db/spamd" +/* Obsolete grey data format. */ +struct ogdata { + int32_t first; /* when did we see it first */ + int32_t pass; /* when was it whitelisted */ + int32_t expire; /* when will we get rid of this entry */ + int bcount; /* how many times have we blocked it */ + int pcount; /* how many times passed, or -1 for spamtrap */ +}; + struct gdata { - time_t first; /* when did we see it first */ - time_t pass; /* when was it whitelisted */ - time_t expire; /* when will we get rid of this entry */ - int bcount; /* how many times have we blocked it */ - int pcount; /* how many times passed, or -1 for spamtrap */ + int64_t first; /* when did we see it first */ + int64_t pass; /* when was it whitelisted */ + int64_t expire; /* when will we get rid of this entry */ + int bcount; /* how many times have we blocked it */ + int pcount; /* how many times passed, or -1 for spamtrap */ }; extern int greywatcher(void); extern int greyupdate(char *, char *, char *, char *, char *, int, char *); +extern int gdcopyin(const void *, struct gdata *); diff --git a/libexec/spamlogd/Makefile b/libexec/spamlogd/Makefile index fca36dea9a9..38c4bf13902 100644 --- a/libexec/spamlogd/Makefile +++ b/libexec/spamlogd/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 2007/03/04 03:19:41 beck Exp $ +# $OpenBSD: Makefile,v 1.7 2013/08/21 16:13:30 millert Exp $ PROG= spamlogd -SRCS= spamlogd.c sync.c +SRCS= spamlogd.c sync.c gdcopy.c MAN= spamlogd.8 CFLAGS+= -Wall -Wstrict-prototypes -I${.CURDIR}/../spamd diff --git a/libexec/spamlogd/spamlogd.c b/libexec/spamlogd/spamlogd.c index 40fd6e5f51c..761c73d8fd1 100644 --- a/libexec/spamlogd/spamlogd.c +++ b/libexec/spamlogd/spamlogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamlogd.c,v 1.21 2011/03/18 22:37:06 okan Exp $ */ +/* $OpenBSD: spamlogd.c,v 1.22 2013/08/21 16:13:30 millert Exp $ */ /* * Copyright (c) 2006 Henning Brauer <henning@openbsd.org> @@ -250,12 +250,12 @@ dbupdate(char *dbname, char *ip) goto bad; } } else { - if (dbd.size != sizeof(gd)) { + /* XXX - backwards compat */ + if (gdcopyin(&dbd, &gd) == -1) { /* whatever this is, it doesn't belong */ db->del(db, &dbk, 0); goto bad; } - memcpy(&gd, dbd.data, sizeof(gd)); gd.pcount++; gd.expire = now + whiteexp; memset(&dbk, 0, sizeof(dbk)); |