* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
/* See local README for interface description. */
static void *
-nisplus_open(uschar *filename, uschar **errmsg)
+nisplus_open(const uschar * filename, uschar ** errmsg)
{
return (void *)(1); /* Just return something non-null */
}
equals sign. */
static int
-nisplus_find(void *handle, uschar *filename, uschar *query, int length,
- uschar **result, uschar **errmsg, uint *do_cache)
+nisplus_find(void * handle, const uschar * filename, const uschar * query,
+ int length, uschar ** result, uschar ** errmsg, uint * do_cache,
+ const uschar * opts)
{
-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 */
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. */
*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. */
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;
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;
}
}
/* 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;
}
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)
{
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 */
+ .name = US"nisplus", /* lookup name */
+ .type = lookup_querystyle, /* query-style lookup */
+ .open = nisplus_open, /* open function */
+ .check = NULL, /* check function */
+ .find = nisplus_find, /* find function */
+ .close = NULL, /* no close function */
+ .tidy = NULL, /* no tidy function */
+ .quote = nisplus_quote, /* quoting function */
+ .version_report = nisplus_version_report /* version reporting */
};
#ifdef DYNLOOKUP
git://git.exim.org / users / heiko / exim.git / blobdiff