Fix error logging for dynamically-loaded modules. Bug 2507

diff --git a/src/src/drtables.c b/src/src/drtables.c
index 558359032170e8a28dc96285a505dea757dc1b0e..b1380df12fb13874edefb77d60bf86254aeb8c0b 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -753,10 +753,10 @@ else
 
       if (!(dl = dlopen(CS big_buffer, RTLD_NOW)))
        {
 
       if (!(dl = dlopen(CS big_buffer, RTLD_NOW)))
        {

-       errormessage = dlerror();
-       fprintf(stderr, "Error loading %s: %s\n", name, errormessage);
+       errormsg = dlerror();
+       fprintf(stderr, "Error loading %s: %s\n", name, errormsg);
+       log_write(0, LOG_MAIN|LOG_PANIC, "Error loading lookup module %s: %s\n", name, errormsg);

        moduleerrors++;
        moduleerrors++;

-       log_write(0, LOG_MAIN|LOG_PANIC, "Error loading lookup module %s: %s\n", name, errormessage);

        continue;
        }
 
        continue;
        }
 


@@ -771,17 +771,17 @@ else
       if ((errormsg = dlerror()))
        {
        fprintf(stderr, "%s does not appear to be a lookup module (%s)\n", name, errormsg);
       if ((errormsg = dlerror()))
        {
        fprintf(stderr, "%s does not appear to be a lookup module (%s)\n", name, errormsg);

+       log_write(0, LOG_MAIN|LOG_PANIC, "%s does not appear to be a lookup module (%s)\n", name, errormsg);

        dlclose(dl);
        moduleerrors++;
        dlclose(dl);
        moduleerrors++;

-       log_write(0, LOG_MAIN|LOG_PANIC, "%s does not appear to be a lookup module (%s)\n", name, errormsg);

        continue;
        }
       if (info->magic != LOOKUP_MODULE_INFO_MAGIC)
        {
        fprintf(stderr, "Lookup module %s is not compatible with this version of Exim\n", name);
        continue;
        }
       if (info->magic != LOOKUP_MODULE_INFO_MAGIC)
        {
        fprintf(stderr, "Lookup module %s is not compatible with this version of Exim\n", name);

+       log_write(0, LOG_MAIN|LOG_PANIC, "Lookup module %s is not compatible with this version of Exim\n", name);

        dlclose(dl);
        moduleerrors++;
        dlclose(dl);
        moduleerrors++;

-       log_write(0, LOG_MAIN|LOG_PANIC, "Lookup module %s is not compatible with this version of Exim\n", name);

        continue;
        }
 
        continue;
        }