projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fakereject'
[exim.git]
/
src
/
src
/
lookups
/
nisplus.c
diff --git
a/src/src/lookups/nisplus.c
b/src/src/lookups/nisplus.c
index 966fd74344ef5f99ee9080b8be845696997e4bee..ff632a1caba466b5da91682e1c6d80a18afbbc85 100644
(file)
--- a/
src/src/lookups/nisplus.c
+++ b/
src/src/lookups/nisplus.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/lookups/nisplus.c,v 1.5 2009/11/16 19:50:38 nm4 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
15
*/
/* 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"
@@
-45,7
+43,7
@@
equals sign. */
static int
nisplus_find(void *handle, uschar *filename, uschar *query, int length,
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 i;
int ssize = 0;
@@
-158,27
+156,26
@@
for (i = 0; i < eo->en_cols.en_cols_len; i++)
if (field_name == NULL)
{
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, &ssize, &offset,US tc->tc_name);
+ yield = string_catn(yield, &ssize, &offset, 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, &ssize, &offset, 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, &ssize, &offset, US"\\", 1);
+ yield = string_cat
n
(yield, &ssize, &offset, value+j, 1);
}
}
- yield = string_cat(yield, &ssize, &offset, US"\"", 1);
+ yield = string_cat
n
(yield, &ssize, &offset, US"\"", 1);
}
}
- else yield = string_cat(yield, &ssize, &offset, value, len);
+ else yield = string_cat
n
(yield, &ssize, &offset, value, len);
- yield = string_cat(yield, &ssize, &offset, US" ", 1);
+ yield = string_cat
n
(yield, &ssize, &offset, US" ", 1);
}
/* When the specified field is found, grab its data and finish */
}
/* When the specified field is found, grab its data and finish */