1655. [bug] Logging multiple versions w/o a size was broken.

[RT #11446]
This commit is contained in:
Mark Andrews 2004-06-11 00:35:38 +00:00
parent 98c575983b
commit fbcc4dd6c2
2 changed files with 9 additions and 3 deletions

View file

@ -3,6 +3,9 @@
1656. [doc] Update DNSSEC description in ARM to cover DS, NSEC
DNSKEY and RRSIG. [RT #11542]
1655. [bug] Logging multiple versions w/o a size was broken.
[RT #11446]
1654. [bug] isc_result_totext() contained array bounds read
error.

View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: log.c,v 1.70.2.8.2.11 2004/06/04 02:19:09 marka Exp $ */
/* $Id: log.c,v 1.70.2.8.2.12 2004/06/11 00:35:38 marka Exp $ */
/* Principal Authors: DCL */
@ -1329,8 +1329,11 @@ isc_log_open(isc_logchannel_t *channel) {
if (stat(path, &statbuf) == 0) {
regular_file = S_ISREG(statbuf.st_mode) ? ISC_TRUE : ISC_FALSE;
/* XXXDCL if not regular_file complain? */
roll = ISC_TF(regular_file && FILE_MAXSIZE(channel) > 0 &&
statbuf.st_size >= FILE_MAXSIZE(channel));
if ((FILE_MAXSIZE(channel) == 0 &&
FILE_VERSIONS(channel) != ISC_LOG_ROLLNEVER) ||
(FILE_MAXSIZE(channel) > 0 &&
statbuf.st_size >= FILE_MAXSIZE(channel)))
roll = regular_file;
} else if (errno == ENOENT)
regular_file = ISC_TRUE;
else