git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lookups: Fix "subdir" filter on a dsearch.
[users/heiko/exim.git]
/
src
/
src
/
lookups
/
dsearch.c
diff --git
a/src/src/lookups/dsearch.c
b/src/src/lookups/dsearch.c
index 455273fb11d5cf92f4c7f435e5a225bad201a0a4..501293ac0330c8f58f7778fe082efee6551f8bd1 100644
(file)
--- a/
src/src/lookups/dsearch.c
+++ b/
src/src/lookups/dsearch.c
@@
-125,8
+125,7
@@
if ( Ulstat(filename, &statbuf) >= 0
&& S_ISDIR(statbuf.st_mode)
&& ( flags & FILTER_DIR
|| keystring[0] != '.'
&& S_ISDIR(statbuf.st_mode)
&& ( flags & FILTER_DIR
|| keystring[0] != '.'
- || keystring[1] != '.'
- || keystring[1] && keystring[2]
+ || keystring[1] && keystring[1] != '.'
) ) ) )
{
/* Since the filename exists in the filesystem, we can return a
) ) ) )
{
/* Since the filename exists in the filesystem, we can return a
@@
-135,10
+134,10
@@
if ( Ulstat(filename, &statbuf) >= 0
return OK;
}
return OK;
}
-if (errno == ENOENT) return FAIL;
+if (errno == ENOENT
|| errno == 0
) return FAIL;
save_errno = errno;
save_errno = errno;
-*errmsg = string_sprintf("%s: lstat
failed", filename
);
+*errmsg = string_sprintf("%s: lstat
: %s", filename, strerror(errno)
);
errno = save_errno;
return DEFER;
}
errno = save_errno;
return DEFER;
}