Commit f27b53f5 authored by Andrew Tridgell's avatar Andrew Tridgell

hopefuly fix logging of "transfer interrupted" messages

parent e08bfe12
......@@ -110,8 +110,6 @@ void log_open(void)
if (depth) return;
depth++;
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_end(ap);
......@@ -124,7 +122,6 @@ void log_open(void)
if (fd == FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
depth--;
return;
}
......@@ -132,6 +129,8 @@ void log_open(void)
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
depth++;
log_open();
if (!io_multiplex_write(fd, buf, strlen(buf))) {
logit(priority, buf);
......@@ -158,8 +157,6 @@ void log_open(void)
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
depth--;
}
void rflush(int fd)
......
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