X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0756eb3cb50d73a77b486e47528f7cb1bffdb299..f3ebb786e451da973560f1c9d8cdb151d25108b5:/src/src/lookups/dbmdb.c diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c index fa6484d34..5e97009cc 100644 --- a/src/src/lookups/dbmdb.c +++ b/src/src/lookups/dbmdb.c @@ -1,15 +1,12 @@ -/* $Cambridge: exim/src/src/lookups/dbmdb.c,v 1.1 2004/10/07 13:10:01 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" #include "lf_functions.h" -#include "dbmdb.h" /************************************************* @@ -18,11 +15,15 @@ /* See local README for interface description */ -void * +static void * dbmdb_open(uschar *filename, uschar **errmsg) { -EXIM_DB *yield; -EXIM_DBOPEN(filename, O_RDONLY, 0, &yield); +uschar * dirname = string_copy(filename); +uschar * s; +EXIM_DB *yield = NULL; + +if ((s = Ustrrchr(dirname, '/'))) *s = '\0'; +EXIM_DBOPEN(filename, dirname, O_RDONLY, 0, &yield); if (yield == NULL) { int save_errno = errno; @@ -45,7 +46,7 @@ file name. If USE_TDB or USE_GDBM is set, we know it is tdb or gdbm, which do the same. Otherwise, for safety, we have to check for x.db or x.dir and x.pag. */ -BOOL +static BOOL dbmdb_check(void *handle, uschar *filename, int modemask, uid_t *owners, gid_t *owngroups, uschar **errmsg) { @@ -58,17 +59,17 @@ rc = lf_check_file(-1, filename, S_IFREG, modemask, owners, owngroups, #else { uschar filebuffer[256]; - sprintf(CS filebuffer, "%.250s.db", filename); + (void)sprintf(CS filebuffer, "%.250s.db", filename); rc = lf_check_file(-1, filebuffer, S_IFREG, modemask, owners, owngroups, "dbm", errmsg); if (rc < 0) /* stat() failed */ { - sprintf(CS filebuffer, "%.250s.dir", filename); + (void)sprintf(CS filebuffer, "%.250s.dir", filename); rc = lf_check_file(-1, filebuffer, S_IFREG, modemask, owners, owngroups, "dbm", errmsg); if (rc == 0) /* x.dir was OK */ { - sprintf(CS filebuffer, "%.250s.pag", filename); + (void)sprintf(CS filebuffer, "%.250s.pag", filename); rc = lf_check_file(-1, filebuffer, S_IFREG, modemask, owners, owngroups, "dbm", errmsg); } @@ -88,9 +89,9 @@ return rc == 0; /* See local README for interface description. This function adds 1 to the keylength in order to include the terminating zero. */ -int -dbmdb_find(void *handle, uschar *filename, uschar *keystring, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) +static int +dbmdb_find(void *handle, uschar *filename, const uschar *keystring, int length, + uschar **result, uschar **errmsg, uint *do_cache) { EXIM_DB *d = (EXIM_DB *)handle; EXIM_DATUM key, data; @@ -122,8 +123,8 @@ return FAIL; /* See local README for interface description */ int -dbmnz_find(void *handle, uschar *filename, uschar *keystring, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) +static dbmnz_find(void *handle, uschar *filename, const uschar *keystring, int length, + uschar **result, uschar **errmsg, uint *do_cache) { return dbmdb_find(handle, filename, keystring, length-1, result, errmsg, do_cache); @@ -131,6 +132,84 @@ return dbmdb_find(handle, filename, keystring, length-1, result, errmsg, +/************************************************* +* Find entry point - zero-joined list key * +*************************************************/ + +/* + * The parameter passed as a key is a list in normal Exim list syntax. + * The elements of that list are joined together on NUL, with no trailing + * NUL, to form the key. + */ + +static int +dbmjz_find(void *handle, uschar *filename, const uschar *keystring, int length, + uschar **result, uschar **errmsg, uint *do_cache) +{ +uschar *key_item, *key_buffer, *key_p; +const uschar *key_elems = keystring; +int buflen, bufleft, key_item_len, sep = 0; + +/* To a first approximation, the size of the lookup key needs to be about, +or less than, the length of the delimited list passed in + 1. */ + +buflen = length + 3; +key_buffer = store_get(buflen, is_tainted(keystring)); + +key_buffer[0] = '\0'; + +key_p = key_buffer; +bufleft = buflen; + +/* In all cases of an empty list item, we can set 1 and advance by 1 and then +pick up the trailing NUL from the previous list item, EXCEPT when at the +beginning of the output string, in which case we need to supply that NUL +ourselves. */ +while ((key_item = string_nextinlist(&key_elems, &sep, key_p, bufleft)) != NULL) + { + key_item_len = Ustrlen(key_item) + 1; + if (key_item_len == 1) + { + key_p[0] = '\0'; + if (key_p == key_buffer) + { + key_p[1] = '\0'; + key_item_len += 1; + } + } + + bufleft -= key_item_len; + if (bufleft <= 0) + { + /* The string_nextinlist() will stop at buffer size, but we should always + have at least 1 character extra, so some assumption has failed. */ + *errmsg = string_copy(US"Ran out of buffer space for joining elements"); + return DEFER; + } + key_p += key_item_len; + } + +if (key_p == key_buffer) + { + *errmsg = string_copy(US"empty list key"); + return FAIL; + } + +/* We do not pass in the final NULL; if needed, the list should include an +empty element to put one in. Boundary: key length 1, is a NULL */ +key_item_len = key_p - key_buffer - 1; + +DEBUG(D_lookup) debug_printf_indent("NUL-joined key length: %d\n", key_item_len); + +/* beware that dbmdb_find() adds 1 to length to get back terminating NUL, so +because we've calculated the real length, we need to subtract one more here */ +return dbmdb_find(handle, filename, + key_buffer, key_item_len - 1, + result, errmsg, do_cache); +} + + + /************************************************* * Close entry point * *************************************************/ @@ -138,9 +217,71 @@ return dbmdb_find(handle, filename, keystring, length-1, result, errmsg, /* See local README for interface description */ void -dbmdb_close(void *handle) +static dbmdb_close(void *handle) { EXIM_DBCLOSE((EXIM_DB *)handle); } + + +/************************************************* +* Version reporting entry point * +*************************************************/ + +/* See local README for interface description. */ + +#include "../version.h" + +void +dbm_version_report(FILE *f) +{ +#ifdef DYNLOOKUP +fprintf(f, "Library version: DBM: Exim version %s\n", EXIM_VERSION_STR); +#endif +} + + +lookup_info dbm_lookup_info = { + US"dbm", /* lookup name */ + lookup_absfile, /* uses absolute file name */ + dbmdb_open, /* open function */ + dbmdb_check, /* check function */ + dbmdb_find, /* find function */ + dbmdb_close, /* close function */ + NULL, /* no tidy function */ + NULL, /* no quoting function */ + dbm_version_report /* version reporting */ +}; + +lookup_info dbmz_lookup_info = { + US"dbmnz", /* lookup name */ + lookup_absfile, /* uses absolute file name */ + dbmdb_open, /* sic */ /* open function */ + dbmdb_check, /* sic */ /* check function */ + dbmnz_find, /* find function */ + dbmdb_close, /* sic */ /* close function */ + NULL, /* no tidy function */ + NULL, /* no quoting function */ + NULL /* no version reporting (redundant) */ +}; + +lookup_info dbmjz_lookup_info = { + US"dbmjz", /* lookup name */ + lookup_absfile, /* uses absolute file name */ + dbmdb_open, /* sic */ /* open function */ + dbmdb_check, /* sic */ /* check function */ + dbmjz_find, /* find function */ + dbmdb_close, /* sic */ /* close function */ + NULL, /* no tidy function */ + NULL, /* no quoting function */ + NULL /* no version reporting (redundant) */ +}; + +#ifdef DYNLOOKUP +#define dbmdb_lookup_module_info _lookup_module_info +#endif + +static lookup_info *_lookup_list[] = { &dbm_lookup_info, &dbmz_lookup_info, &dbmjz_lookup_info }; +lookup_module_info dbmdb_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 3 }; + /* End of lookups/dbmdb.c */