diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-05-10 11:32:24 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-05-10 11:32:24 +0000 |
| commit | 4ff8c9c350cbf95960db65d16d732d160443ce5c (patch) | |
| tree | dfededd3227a709978d412818597d4942288d891 | |
| parent | 3dc7106bc96df0c815a26fb2b6935cf1d30fc6ce (diff) | |
| download | mailfromd-4ff8c9c350cbf95960db65d16d732d160443ce5c.tar.gz mailfromd-4ff8c9c350cbf95960db65d16d732d160443ce5c.tar.bz2 | |
Minor fixes
git-svn-id: file:///svnroot/mailfromd/trunk@1418 7a8a7f39-df28-0410-adc6-e0d955640f24
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/engine.c | 5 | ||||
| -rw-r--r-- | src/mu_dbm.c | 8 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2007-05-10 Sergey Poznyakoff <gray@gnu.org.ua> + + * src/mu_dbm.c [WITH_BDB] (mu_dbm_open): Up to v.4.1 there were no + txn argument to db->open. + * src/engine.c (check_on_host): Clear last_poll_* values before + startning the new poll. + 2007-05-08 Sergey Poznyakoff <gray@gnu.org.ua> * src/engine.c (check_portspec): Bugfix diff --git a/src/engine.c b/src/engine.c index b2cf2bfe..7cc94668 100644 --- a/src/engine.c +++ b/src/engine.c @@ -568,6 +568,9 @@ check_on_host(eval_environ_t env, char *email, char *client_addr, time_t timeout, start = time(NULL); debug2(10, "email = %s, client_addr = %s", email, client_addr); + + set_last_poll_result(env, client_addr, "", ""); + rc = mu_tcp_stream_create_with_source_ip (&stream, client_addr, 25, source_address, MU_STREAM_NONBLOCK); @@ -1308,7 +1311,7 @@ check_portspec(char *portspec) int skip; void (*check)(char *); } spectab[] = { - { "/", 0, check_local_portspec }, + { "/", 0, check_local_portspec }, { "unix:", 1, check_local_portspec }, { "local:", 1, check_local_portspec }, { "inet:", 1, NULL }, diff --git a/src/mu_dbm.c b/src/mu_dbm.c index a4da71ee..67473433 100644 --- a/src/mu_dbm.c +++ b/src/mu_dbm.c @@ -367,6 +367,12 @@ mu_dbm_errcall_fcn (const char *errpfx, char *msg) mu_error ("Berkeley DB error: %s", msg); } +#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 +# define DB_TXN_NULL NULL, +#else +# define DB_TXN_NULL +#endif + int mu_dbm_open (char *name, DBM_FILE *dbm, int flags, int mode, int *ro) { @@ -449,7 +455,7 @@ mu_dbm_open (char *name, DBM_FILE *dbm, int flags, int mode, int *ro) # if DB_VERSION_MAJOR == 3 mu_dbm_errno = db->open (db, name, NULL, DB_HASH, f, mode); # else - mu_dbm_errno = db->open (db, NULL, name, NULL, DB_HASH, f, mode); + mu_dbm_errno = db->open (db, DB_TXN_NULL name, NULL, DB_HASH, f, mode); # endif #endif if (mu_dbm_errno) |