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
Corrected several mis-calls of is_ip_address() that treated the result
[exim.git]
/
src
/
src
/
lookups
/
lsearch.c
diff --git
a/src/src/lookups/lsearch.c
b/src/src/lookups/lsearch.c
index 2a143576c5ad8949f6b775e2e05274fc150bf63e..f91ddf89cb1b0b2582e53cb6a7cf292a98dd7beb 100644
(file)
--- a/
src/src/lookups/lsearch.c
+++ b/
src/src/lookups/lsearch.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/lookups/lsearch.c,v 1.
2 2005/01/04 10:00:44
ph10 Exp $ */
+/* $Cambridge: exim/src/src/lookups/lsearch.c,v 1.
3 2005/01/11 15:51:03
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-213,7
+213,7
@@
for (last_was_eol = TRUE;
int maskoffset;
int save = buffer[linekeylength];
buffer[linekeylength] = 0;
int maskoffset;
int save = buffer[linekeylength];
buffer[linekeylength] = 0;
- if (
!string_is_ip_address(buffer, &maskoffset)
||
+ if (
string_is_ip_address(buffer, &maskoffset) == 0
||
!host_is_in_net(keystring, buffer, maskoffset)) continue;
buffer[linekeylength] = save;
}
!host_is_in_net(keystring, buffer, maskoffset)) continue;
buffer[linekeylength] = save;
}
@@
-369,7
+369,7
@@
iplsearch_find(void *handle, uschar *filename, uschar *keystring, int length,
{
do_cache = do_cache; /* Keep picky compilers happy */
if ((length == 1 && keystring[0] == '*') ||
{
do_cache = do_cache; /* Keep picky compilers happy */
if ((length == 1 && keystring[0] == '*') ||
- string_is_ip_address(keystring, NULL))
+ string_is_ip_address(keystring, NULL)
> 0
)
{
return internal_lsearch_find(handle, filename, keystring, length, result,
errmsg, LSEARCH_IP);
{
return internal_lsearch_find(handle, filename, keystring, length, result,
errmsg, LSEARCH_IP);