git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
constify
[exim.git]
/
src
/
src
/
lookups
/
nisplus.c
diff --git
a/src/src/lookups/nisplus.c
b/src/src/lookups/nisplus.c
index ff632a1caba466b5da91682e1c6d80a18afbbc85..370f6a655ca1366df0a1c1a40e4d5a7c78bfce99 100644
(file)
--- a/
src/src/lookups/nisplus.c
+++ b/
src/src/lookups/nisplus.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
5
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
@@
-18,7
+18,7
@@
/* See local README for interface description. */
static void *
/* 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 */
}
{
return (void *)(1); /* Just return something non-null */
}
@@
-42,21
+42,18
@@
yield is the concatenation of all the fields, preceded by their names and an
equals sign. */
static int
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)
{
{
-int i;
-int ssize = 0;
-int offset = 0;
int error_error = FAIL;
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;
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 */
do_cache = do_cache; /* Placate picky compilers */
@@
-65,12
+62,15
@@
has been given. */
while (p > query && p[-1] != ':') p--;
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;
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. */
/* Now search backwards to find the comma that starts the
table name. */
@@
-102,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;
}
*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. */
/* Now look up the entry in the table, check that we got precisely one
object and that it is a table entry. */
@@
-137,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);
with their names. */
eo = &(eno->zo_data.objdata_u.en_data);
-for (i = 0; i < eo->en_cols.en_cols_len; i++)
+for (i
nt 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;
{
table_col *tc = ta->ta_cols.ta_cols_val + i;
entry_col *ec = eo->en_cols.en_cols_val + i;
@@
-148,41
+148,42
@@
for (i = 0; i < eo->en_cols.en_cols_len; i++)
empty string for consistency. Remove trailing whitespace and zero
bytes. */
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 */
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);
- yield = string_catn(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)
{
/* Quote the value if it contains spaces or is empty */
if (value[0] == 0 || Ustrchr(value, ' ') != NULL)
{
- int j;
- yield = string_catn(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] == '\\')
{
if (value[j] == '\"' || value[j] == '\\')
- yield = string_catn(yield,
&ssize, &offset,
US"\\", 1);
- yield = string_catn(yield,
&ssize, &offset,
value+j, 1);
+ yield = string_catn(yield, US"\\", 1);
+ yield = string_catn(yield, value+j, 1);
}
}
- yield = string_catn(yield,
&ssize, &offset,
US"\"", 1);
+ yield = string_catn(yield, US"\"", 1);
}
}
- else yield = string_catn(yield, &ssize, &offset, value, len);
+ else
+ yield = string_catn(yield, value, len);
- yield = string_catn(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)
{
}
/* When the specified field is found, grab its data and finish */
else if (Ustrcmp(field_name, tc->tc_name) == 0)
{
- yield = string_c
opyn(
value, len);
+ yield = string_c
atn(yield,
value, len);
goto NISPLUS_EXIT;
}
}
goto NISPLUS_EXIT;
}
}
@@
-190,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. */
/* 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
*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:
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;
}
return OK;
}
@@
-244,7
+240,7
@@
if (opt != NULL) return NULL; /* No options recognized */
while (*t != 0) if (*t++ == '\"') count++;
if (count == 0) return s;
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)
{
while (*s != 0)
{