X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0756eb3cb50d73a77b486e47528f7cb1bffdb299..d8d7e3a4162b52382daf8319f221c085c76c5b8f:/src/src/lookups/nisplus.c diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c index 865924498..98f3df303 100644 --- a/src/src/lookups/nisplus.c +++ b/src/src/lookups/nisplus.c @@ -1,29 +1,12 @@ -/* $Cambridge: exim/src/src/lookups/nisplus.c,v 1.1 2004/10/07 13:10:01 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" #include "lf_functions.h" -#include "nisplus.h" - -/* We can't just compile this code and allow the library mechanism to omit the -functions if they are not wanted, because we need to have the NIS+ header -available for compiling. Therefore, compile these functions only if -LOOKUP_NISPLUS is defined. However, some compilers don't like compiling empty -modules, so keep them happy with a dummy when skipping the rest. Make it -reference itself to stop picky compilers complaining that it is unused, and put -in a dummy argument to stop even pickier compilers complaining about infinite -loops. */ - -#ifndef LOOKUP_NISPLUS -static void dummy(int x) { dummy(x-1); } -#else - #include @@ -34,7 +17,7 @@ static void dummy(int x) { dummy(x-1); } /* See local README for interface description. */ -void * +static void * nisplus_open(uschar *filename, uschar **errmsg) { return (void *)(1); /* Just return something non-null */ @@ -58,22 +41,19 @@ name tagged on the end after a colon. If there is no result-field name, the yield is the concatenation of all the fields, preceded by their names and an equals sign. */ -int -nisplus_find(void *handle, uschar *filename, uschar *query, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) +static int +nisplus_find(void *handle, uschar *filename, const uschar *query, int length, + uschar **result, uschar **errmsg, uint *do_cache) { -int i; -int ssize = 0; -int offset = 0; int error_error = FAIL; -uschar *field_name = NULL; +const uschar * field_name = NULL; nis_result *nrt = NULL; nis_result *nre = NULL; nis_object *tno, *eno; struct entry_obj *eo; struct table_obj *ta; -uschar *p = query + length; -uschar *yield = NULL; +const uschar * p = query + length; +gstring * yield = NULL; do_cache = do_cache; /* Placate picky compilers */ @@ -82,12 +62,15 @@ has been given. */ while (p > query && p[-1] != ':') p--; -if (p > query) +if (p > query) /* get the query without the result-field */ { + uint len = p-1 - query; field_name = p; - p[-1] = 0; + query = string_copyn(query, len); + p = query + len; } -else p = query + length; +else + p = query + length; /* Now search backwards to find the comma that starts the table name. */ @@ -119,7 +102,7 @@ if (tno->zo_data.zo_type != TABLE_OBJ) *errmsg = string_sprintf("NIS+ error: %s is not a table", p); goto NISPLUS_EXIT; } -ta = &(tno->zo_data.objdata_u.ta_data); +ta = &tno->zo_data.objdata_u.ta_data; /* Now look up the entry in the table, check that we got precisely one object and that it is a table entry. */ @@ -154,7 +137,7 @@ was given, look for that field; otherwise concatenate all the fields with their names. */ eo = &(eno->zo_data.objdata_u.en_data); -for (i = 0; i < eo->en_cols.en_cols_len; i++) +for (int i = 0; i < eo->en_cols.en_cols_len; i++) { table_col *tc = ta->ta_cols.ta_cols_val + i; entry_col *ec = eo->en_cols.en_cols_val + i; @@ -165,42 +148,42 @@ for (i = 0; i < eo->en_cols.en_cols_len; i++) empty string for consistency. Remove trailing whitespace and zero bytes. */ - if (value == NULL) value = US""; else + if (!value) value = US""; + else while (len > 0 && (value[len-1] == 0 || isspace(value[len-1]))) len--; /* Concatenate all fields if no specific one selected */ - if (field_name == NULL) + if (!field_name) { - yield = string_cat(yield, &ssize, &offset,US tc->tc_name, - Ustrlen(tc->tc_name)); - yield = string_cat(yield, &ssize, &offset, US"=", 1); + yield = string_cat (yield, US tc->tc_name); + yield = string_catn(yield, US"=", 1); /* Quote the value if it contains spaces or is empty */ if (value[0] == 0 || Ustrchr(value, ' ') != NULL) { - int j; - yield = string_cat(yield, &ssize, &offset, US"\"", 1); - for (j = 0; j < len; j++) + yield = string_catn(yield, US"\"", 1); + for (int j = 0; j < len; j++) { if (value[j] == '\"' || value[j] == '\\') - yield = string_cat(yield, &ssize, &offset, US"\\", 1); - yield = string_cat(yield, &ssize, &offset, value+j, 1); + yield = string_catn(yield, US"\\", 1); + yield = string_catn(yield, value+j, 1); } - yield = string_cat(yield, &ssize, &offset, US"\"", 1); + yield = string_catn(yield, US"\"", 1); } - else yield = string_cat(yield, &ssize, &offset, value, len); + else + yield = string_catn(yield, value, len); - yield = string_cat(yield, &ssize, &offset, US" ", 1); + yield = string_catn(yield, US" ", 1); } /* When the specified field is found, grab its data and finish */ else if (Ustrcmp(field_name, tc->tc_name) == 0) { - yield = string_copyn(value, len); + yield = string_catn(yield, value, len); goto NISPLUS_EXIT; } } @@ -208,26 +191,21 @@ for (i = 0; i < eo->en_cols.en_cols_len; i++) /* Error if a field name was specified and we didn't find it; if no field name, ensure the concatenated data is zero-terminated. */ -if (field_name != NULL) +if (field_name) *errmsg = string_sprintf("NIS+ field %s not found for %s", field_name, query); else - { - yield[offset] = 0; - store_reset(yield + offset + 1); - } + gstring_release_unused(yield); -/* Restore the colon in the query, and free result store before -finishing. */ +/* Free result store before finishing. */ NISPLUS_EXIT: -if (field_name != NULL) field_name[-1] = ':'; -if (nrt != NULL) nis_freeresult(nrt); -if (nre != NULL) nis_freeresult(nre); +if (nrt) nis_freeresult(nrt); +if (nre) nis_freeresult(nre); -if (yield != NULL) +if (yield) { - *result = yield; + *result = string_from_gstring(yield); return OK; } @@ -250,7 +228,7 @@ Arguments: Returns: the processed string or NULL for a bad option */ -uschar * +static uschar * nisplus_quote(uschar *s, uschar *opt) { int count = 0; @@ -262,7 +240,7 @@ if (opt != NULL) return NULL; /* No options recognized */ while (*t != 0) if (*t++ == '\"') count++; if (count == 0) return s; -t = quoted = store_get(Ustrlen(s) + count + 1); +t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s)); while (*s != 0) { @@ -274,6 +252,41 @@ while (*s != 0) return quoted; } -#endif /* LOOKUP_NISPLUS */ + +/************************************************* +* Version reporting entry point * +*************************************************/ + +/* See local README for interface description. */ + +#include "../version.h" + +void +nisplus_version_report(FILE *f) +{ +#ifdef DYNLOOKUP +fprintf(f, "Library version: NIS+: Exim version %s\n", EXIM_VERSION_STR); +#endif +} + + +static lookup_info _lookup_info = { + US"nisplus", /* lookup name */ + lookup_querystyle, /* query-style lookup */ + nisplus_open, /* open function */ + NULL, /* check function */ + nisplus_find, /* find function */ + NULL, /* no close function */ + NULL, /* no tidy function */ + nisplus_quote, /* quoting function */ + nisplus_version_report /* version reporting */ +}; + +#ifdef DYNLOOKUP +#define nisplus_lookup_module_info _lookup_module_info +#endif + +static lookup_info *_lookup_list[] = { &_lookup_info }; +lookup_module_info nisplus_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 }; /* End of lookups/nisplus.c */