Commit 3fe7acaa authored by Evan Hunt's avatar Evan Hunt
Browse files

Merge branch '902-hang-when-unexpected-errno-encountered-during-log-rename' into 'master'

Resolve "Hang when unexpected errno encountered during log rename"

Closes #902

See merge request !1567
parents fced495d 435ae2f2
Pipeline #11464 passed with stages
in 58 seconds
5178. [bug] Handle EDQUOT (disk quota) and ENOSPC (disk full)
errors when writing files. [GL #902]
5177. [func] Add the ability to specify in named.conf whether a
response-policy zone's SOA record should be added
to the additional section (add-soa yes/no). [GL #865]
......
......@@ -85,9 +85,11 @@
#define ISC_R_WOULDBLOCK 63 /*%< would block */
#define ISC_R_COMPLETE 64 /*%< complete */
#define ISC_R_CRYPTOFAILURE 65 /*%< cryptography library failure */
#define ISC_R_DISCQUOTA 66 /*%< disc quota */
#define ISC_R_DISCFULL 67 /*%< disc full */
/*% Not a result code: the number of results. */
#define ISC_R_NRESULTS 66
#define ISC_R_NRESULTS 68
ISC_LANG_BEGINDECLS
......
......@@ -99,6 +99,8 @@ static const char *description[ISC_R_NRESULTS] = {
"would block", /*%< 63 */
"complete", /*%< 64 */
"crypto failure", /*%< 65 */
"disc quota", /*%< 66 */
"disc full", /*%< 67 */
};
static const char *identifier[ISC_R_NRESULTS] = {
......@@ -168,6 +170,8 @@ static const char *identifier[ISC_R_NRESULTS] = {
"ISC_R_WOULDBLOCK",
"ISC_R_COMPLETE",
"ISC_R_CRYPTOFAILURE",
"ISC_R_DISCQUOTA",
"ISC_R_DISCFULL",
};
#define ISC_RESULT_RESULTSET 2
......
......@@ -57,6 +57,12 @@ isc___errno2result(int posixerrno, bool dolog,
case ENFILE:
case EMFILE:
return (ISC_R_TOOMANYOPENFILES);
#ifdef EDQUOT
case EDQUOT:
return (ISC_R_DISCQUOTA);
#endif
case ENOSPC:
return (ISC_R_DISCFULL);
#ifdef EOVERFLOW
case EOVERFLOW:
return (ISC_R_RANGE);
......
......@@ -63,6 +63,8 @@ isc__errno2resultx(int posixerrno, bool dolog,
case EMFILE:
case WSAEMFILE:
return (ISC_R_TOOMANYOPENFILES);
case ENOSPC:
return (ISC_R_DISCFULL);
case ERROR_CANCELLED:
return (ISC_R_CANCELED);
case ERROR_CONNECTION_REFUSED:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment