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
Copyright updates:
[exim.git]
/
src
/
src
/
drtables.c
diff --git
a/src/src/drtables.c
b/src/src/drtables.c
index 72f47c1ea8b73e5ae7901bcef18358c9bd7266a5..1e3269f4a2628214bf3307da8ff16d72cd46d3ee 100644
(file)
--- a/
src/src/drtables.c
+++ b/
src/src/drtables.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
#include "exim.h"
@@
-518,7
+519,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_get(sizeof(struct lookupmodulestr),
FALSE
);
+struct lookupmodulestr *p = store_get(sizeof(struct lookupmodulestr),
GET_UNTAINTED
);
p->dl = dl;
p->info = info;
p->dl = dl;
p->info = info;
@@
-728,15
+729,15
@@
if (!(dd = exim_opendir(LOOKUP_MODULE_DIR)))
}
else
{
}
else
{
- const pcre
*
regex_islookupmod = regex_must_compile(
- US"\\." DYNLIB_FN_EXT "$",
FALSE
, TRUE);
+ const pcre
2_code *
regex_islookupmod = regex_must_compile(
+ US"\\." DYNLIB_FN_EXT "$",
MCS_NOFLAGS
, TRUE);
DEBUG(D_lookup) debug_printf("Loading lookup modules from %s\n", LOOKUP_MODULE_DIR);
while ((ent = readdir(dd)))
{
DEBUG(D_lookup) debug_printf("Loading lookup modules from %s\n", LOOKUP_MODULE_DIR);
while ((ent = readdir(dd)))
{
- char *name = ent->d_name;
+ char *
name = ent->d_name;
int len = (int)strlen(name);
int len = (int)strlen(name);
- if (
pcre_exec(regex_islookupmod, NULL, name, len, 0, PCRE_EOPT, NULL, 0) >= 0
)
+ if (
regex_match(regex_islookupmod, US name, len, NULL)
)
{
int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2;
void *dl;
{
int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2;
void *dl;