>
> There were no changes since the RC4 almost a week ago. The release
> has been rebuilt and re-signed by me.
4.90 doesn't compile on my system (Centos 6 64bit):
gcc nisplus.c
nisplus.c: In function 'nisplus_find':
nisplus.c:58: error: conflicting types for 'yield'
nisplus.c:57: note: previous definition of 'yield' was here
nisplus.c:158: warning: pointer targets in passing argument 2 of 'string_cat' differ in signedness
../functions.h:448: note: expected 'const uschar *' but argument is of type 'char *'
nisplus.c:176: error: 'eyield' undeclared (first use in this function)
nisplus.c:176: error: (Each undeclared identifier is reported only once
nisplus.c:176: error: for each function it appears in.)
I think, the attached patch fixes the problem, but i'm bit in a hurry, Christmas is coming.
Best regards,
-ap
--- exim-4.90/src/lookups/nisplus.c 2017-12-12 23:14:38.000000000 +0100
+++ exim-4.90.mod/src/lookups/nisplus.c 2017-12-21 15:30:57.911783510 +0100
@@ -54,7 +54,6 @@ nis_object *tno, *eno;
struct entry_obj *eo;
struct table_obj *ta;
uschar *p = query + length;
-uschar *yield = NULL;
gstring * yield = NULL;
do_cache = do_cache; /* Placate picky compilers */
@@ -173,9 +172,7 @@ for (i = 0; i < eo->en_cols.en_cols_len;
yield = string_catn(yield, US"\"", 1);
}
else
- eyield = string_catn(yield, value, len);
-
- yield = string_catn(yield, US" ", 1);
+ yield = string_catn(yield, US" ", 1);
}
/* When the specified field is found, grab its data and finish */
