projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction on string comparison
[exim.git]
/
src
/
src
/
lookups
/
nisplus.c
diff --git
a/src/src/lookups/nisplus.c
b/src/src/lookups/nisplus.c
index 00f30193ce63f2880ca8b901f28e39cfb35cb671..e2115a520627063ad9f643e1dcb1e844c9d953e7 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"
@@
-42,21
+42,19
@@
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,
+nisplus_find(void *handle, uschar *filename,
const
uschar *query, int length,
uschar **result, uschar **errmsg, uint *do_cache)
{
int i;
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
+63,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
+103,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. */
@@
-154,36
+155,36
@@
for (i = 0; i < eo->en_cols.en_cols_len; i++)
/* Concatenate all fields if no specific one selected */
/* 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, 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;
/* 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_cat
n(yield
, US"\"", 1);
for (j = 0; j < len; j++)
{
if (value[j] == '\"' || value[j] == '\\')
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_cat
n(yield
, US"\\", 1);
+ yield = string_cat
n(yield
, value+j, 1);
}
}
- yield = string_cat
(yield, &ssize, &offset
, US"\"", 1);
+ yield = string_cat
n(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_cat
n(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;
}
}
@@
-191,26
+192,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);
- }
+ store_reset(yield->s + yield->ptr + 1);
-/* 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;
}