X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Flookups%2Fnisplus.c;h=7cd00eedf15cd865dde0bffc289f0d132e613d9c;hb=8dcf2dc4a641fb142ec0b27538e9ffcf0c2407fc;hp=8659244982fa15f350ec297bcee645d5165efc2e;hpb=0756eb3cb50d73a77b486e47528f7cb1bffdb299;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c index 865924498..7cd00eedf 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 - 2017 */ /* 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,13 +41,11 @@ 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 +static int nisplus_find(void *handle, uschar *filename, uschar *query, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) + uschar **result, uschar **errmsg, uint *do_cache) { int i; -int ssize = 0; -int offset = 0; int error_error = FAIL; uschar *field_name = NULL; nis_result *nrt = NULL; @@ -73,7 +54,7 @@ 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,34 +154,34 @@ for (i = 0; i < eo->en_cols.en_cols_len; i++) if (field_name == NULL) { - 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, 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); + yield = string_catn(yield, US"\"", 1); for (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 +189,23 @@ 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); - } + store_reset(yield->s + yield->ptr + 1); /* Restore the colon in the query, and 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 (field_name) field_name[-1] = ':'; +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; @@ -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 */