sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

debug: detect logrotation by checking inode number

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14248

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-11-23 16:04:03 +01:00 committed by Jeremy Allison
parent b7ee361464
commit 3651a51e93
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/util/debug.c
View File

@ -113,6 +113,8 @@ struct debug_class {
*/
char *logfile;
int fd;
/* inode number of the logfile to detect logfile rotation */
ino_t ino;
};
static const char *default_classname_table[] = {
@ -1086,7 +1088,9 @@ static bool reopen_one_log(struct debug_class *config)
{
int old_fd = config->fd;
const char *logfile = config->logfile;
struct stat st;
int new_fd;
int ret;
if (logfile == NULL) {
debug_close_fd(old_fd);
@ -1107,6 +1111,16 @@ static bool reopen_one_log(struct debug_class *config)
smb_set_close_on_exec(new_fd);
config->fd = new_fd;
ret = fstat(new_fd, &st);
if (ret != 0) {
log_overflow = true;
DBG_ERR("Unable to fstat() new log file '%s': %s\n",
logfile, strerror(errno));
log_overflow = false;
return false;
}
config->ino = st.st_ino;
return true;
}
@ -1254,17 +1268,26 @@ static void do_one_check_log_size(off_t maxlog, struct debug_class *config)
char name[strlen(config->logfile) + 5];
struct stat st;
int ret;
bool reopen = false;
bool ok;
if (maxlog == 0) {
return;
}
ret = fstat(config->fd, &st);
ret = stat(config->logfile, &st);
if (ret != 0) {
return;
}
if (st.st_size < maxlog ) {
if (st.st_size >= maxlog ) {
reopen = true;
}
if (st.st_ino != config->ino) {
reopen = true;
}
if (!reopen) {
return;
}
@ -1276,8 +1299,12 @@ static void do_one_check_log_size(off_t maxlog, struct debug_class *config)
}
ret = fstat(config->fd, &st);
if (ret != 0) {
config->ino = (ino_t)0;
return;
}
config->ino = st.st_ino;
if (st.st_size < maxlog) {
return;
}