summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-03-21 01:45:59 -0700
committerPhil Pennock <pdp@exim.org>2012-03-21 01:45:59 -0700
commitc45dd1801a10dc40580d422218ae8bfcd7128fc8 (patch)
tree0b963f5b5a444a4a02e4d9b985cf08880821612e /src
parentc7955b11ec2f588b346b0bcdbd1e2fa1b55b1630 (diff)
parent4a6a987a85df3ff3706a930aa580b0d5d708c580 (diff)
Merge branch 'dbmjz'
Diffstat (limited to 'src')
-rw-r--r--src/src/exim.c2
-rw-r--r--src/src/lookups/dbmdb.c96
2 files changed, 94 insertions, 4 deletions
diff --git a/src/src/exim.c b/src/src/exim.c
index 4a690a783..8df6aed54 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -816,7 +816,7 @@ fprintf(f, "Lookups (built-in):");
fprintf(f, " cdb");
#endif
#if defined(LOOKUP_DBM) && LOOKUP_DBM!=2
- fprintf(f, " dbm dbmnz");
+ fprintf(f, " dbm dbmjz dbmnz");
#endif
#if defined(LOOKUP_DNSDB) && LOOKUP_DNSDB!=2
fprintf(f, " dnsdb");
diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index de4ec0047..b4d6821ca 100644
--- a/src/src/lookups/dbmdb.c
+++ b/src/src/lookups/dbmdb.c
@@ -18,7 +18,7 @@
static void *
dbmdb_open(uschar *filename, uschar **errmsg)
{
-EXIM_DB *yield;
+EXIM_DB *yield = NULL;
EXIM_DBOPEN(filename, O_RDONLY, 0, &yield);
if (yield == NULL)
{
@@ -129,6 +129,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, uschar *keystring, int length,
+ uschar **result, uschar **errmsg, BOOL *do_cache)
+{
+uschar *key_item, *key_buffer, *key_p;
+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);
+
+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("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 *
*************************************************/
@@ -183,11 +261,23 @@ lookup_info dbmz_lookup_info = {
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 };
-lookup_module_info dbmdb_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 2 };
+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 */