git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: restore TLS protocol version to default Received: header
[exim.git]
/
src
/
src
/
drtables.c
diff --git
a/src/src/drtables.c
b/src/src/drtables.c
index 54d03edab455878717585275f49e5cf267924883..05975628445debcd6cf430ded748b15d34c5b9df 100644
(file)
--- a/
src/src/drtables.c
+++ b/
src/src/drtables.c
@@
-509,7
+509,7
@@
static struct lookupmodulestr *lookupmodules = NULL;
static void
addlookupmodule(void *dl, struct lookup_module_info *info)
{
static void
addlookupmodule(void *dl, struct lookup_module_info *info)
{
-struct lookupmodulestr *p = store_
malloc(sizeof(struct lookupmodulestr)
);
+struct lookupmodulestr *p = store_
get(sizeof(struct lookupmodulestr), FALSE
);
p->dl = dl;
p->info = info;
p->dl = dl;
p->info = info;
@@
-564,6
+564,9
@@
extern lookup_module_info dsearch_lookup_module_info;
#if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
extern lookup_module_info ibase_lookup_module_info;
#endif
#if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
extern lookup_module_info ibase_lookup_module_info;
#endif
+#if defined(LOOKUP_JSON)
+extern lookup_module_info json_lookup_module_info;
+#endif
#if defined(LOOKUP_LDAP)
extern lookup_module_info ldap_lookup_module_info;
#endif
#if defined(LOOKUP_LDAP)
extern lookup_module_info ldap_lookup_module_info;
#endif
@@
-617,12
+620,12
@@
init_lookup_list(void)
int countmodules = 0;
int moduleerrors = 0;
#endif
int countmodules = 0;
int moduleerrors = 0;
#endif
- struct lookupmodulestr *p;
static BOOL lookup_list_init_done = FALSE;
static BOOL lookup_list_init_done = FALSE;
-
+ rmark reset_point;
if (lookup_list_init_done)
return;
if (lookup_list_init_done)
return;
+ reset_point = store_mark();
lookup_list_init_done = TRUE;
#if defined(LOOKUP_CDB) && LOOKUP_CDB!=2
lookup_list_init_done = TRUE;
#if defined(LOOKUP_CDB) && LOOKUP_CDB!=2
@@
-649,6
+652,10
@@
init_lookup_list(void)
addlookupmodule(NULL, &ldap_lookup_module_info);
#endif
addlookupmodule(NULL, &ldap_lookup_module_info);
#endif
+#ifdef LOOKUP_JSON
+ addlookupmodule(NULL, &json_lookup_module_info);
+#endif
+
#if defined(LOOKUP_LSEARCH) && LOOKUP_LSEARCH!=2
addlookupmodule(NULL, &lsearch_lookup_module_info);
#endif
#if defined(LOOKUP_LSEARCH) && LOOKUP_LSEARCH!=2
addlookupmodule(NULL, &lsearch_lookup_module_info);
#endif
@@
-780,17
+787,10
@@
init_lookup_list(void)
memset(lookup_list, 0, sizeof(lookup_info *) * lookup_list_count);
/* now add all lookups to the real list */
memset(lookup_list, 0, sizeof(lookup_info *) * lookup_list_count);
/* now add all lookups to the real list */
- p = lookupmodules;
- while (p) {
- struct lookupmodulestr *pnext;
-
+ for (struct lookupmodulestr * p = lookupmodules; p; p = p->next)
for (int j = 0; j < p->info->lookupcount; j++)
add_lookup_to_list(p->info->lookups[j]);
for (int j = 0; j < p->info->lookupcount; j++)
add_lookup_to_list(p->info->lookups[j]);
-
- pnext = p->next;
- store_free(p);
- p = pnext;
- }
+ store_reset(reset_point);
/* just to be sure */
lookupmodules = NULL;
}
/* just to be sure */
lookupmodules = NULL;
}