upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 20:12:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve error message when directory name is given

Browse source 
Surprising error IO error is returned when directory name
is given instead of named.conf file. It can be passed to named-checkconf
or include statement. Make a simple change to return Invalid file
instead. Still not precise, but much better error message is returned.

Fix of rhbz#490837.
This commit is contained in:
Petr Menšík 2021-11-30 00:04:35 +01:00 committed by Matthijs Mekking
parent a181b556f0
commit 929bbe192d
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/isc/errno2result.c
View file

@ -37,6 +37,8 @@ isc___errno2result(int posixerrno, bool dolog, const char *file,
case ENAMETOOLONG:
case EBADF:
return (ISC_R_INVALIDFILE);
case EISDIR:
return (ISC_R_NOTFILE);
case ENOENT:
return (ISC_R_FILENOTFOUND);
case EACCES:

6
lib/isc/lex.c
View file

@ -27,6 +27,8 @@
#include <isc/string.h>
#include <isc/util.h>
#include "errno2result.h"
typedef struct inputsource {
isc_result_t result;
bool is_file;
@ -425,7 +427,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
#endif /* if defined(HAVE_FLOCKFILE) && defined(HAVE_GETC_UNLOCKED) */
if (c == EOF) {
if (ferror(stream)) {
source->result = ISC_R_IOERROR;
source->result =
isc__errno2result(
errno);
result = source->result;
goto done;
}