sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

fixed the log wrapping bug.

Browse Source 
This is a very nasty bug that I think explains quite a few
intermittent problems people have been having with Samba.

It may be worth checking on other cases where errno can be overwritten
by seemingly innocuous things (in this case a DEBUG() line)
(This used to be commit 1448f528b60402170257c1cdf6831cc40b4c86c9)
This commit is contained in:
Andrew Tridgell 1997-10-10 02:32:01 +00:00
parent 805749baab
commit 1ece349db5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source3/lib/util.c
View File

@ -156,7 +156,7 @@ static void check_log_size(void)
int maxlog;
struct stat st;
if (debug_count++ < 100) return;
if (debug_count++ < 100 || getuid() != 0) return;
maxlog = lp_max_log_size() * 1024;
if (!dbf || maxlog <= 0) return;
@ -190,7 +190,8 @@ va_dcl
char *format_str;
#endif
va_list ap;
int old_errno = errno;
if (stdout_logging) {
#ifdef __STDC__
va_start(ap, format_str);
@ -200,6 +201,7 @@ va_dcl
#endif
vfprintf(dbf,format_str,ap);
va_end(ap);
errno = old_errno;
return(0);
}
@ -207,16 +209,17 @@ va_dcl
if (!lp_syslog_only())
#endif
{
if (!dbf)
{
int oldumask = umask(022);
dbf = fopen(debugf,"w");
umask(oldumask);
if (dbf)
setbuf(dbf,NULL);
else
return(0);
}
if (!dbf) {
int oldumask = umask(022);
dbf = fopen(debugf,"w");
umask(oldumask);
if (dbf) {
setbuf(dbf,NULL);
} else {
errno = old_errno;
return(0);
}
}
}
#ifdef SYSLOG
@ -273,6 +276,8 @@ va_dcl
check_log_size();
errno = old_errno;
return(0);
}