Author: obrien
Date: Mon Jul 2 07:37:06 2012
New Revision: 237973
URL: http://svn.freebsd.org/changeset/base/237973
Log:
MFC: r228193: tweak the r137233 fix to r136283 -- Code was making two send()
attempts vs. the comment documented "If we are working with a privileged
socket, then take only one attempt". Make the code match.
Modified:
stable/9/lib/libc/gen/syslog.c
Directory Properties:
stable/9/ (props changed)
stable/9/lib/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/9/lib/libc/gen/syslog.c
==============================================================================
--- stable/9/lib/libc/gen/syslog.c Mon Jul 2 07:27:14 2012
(r237972)
+++ stable/9/lib/libc/gen/syslog.c Mon Jul 2 07:37:06 2012
(r237973)
@@ -265,7 +265,7 @@ vsyslog(int pri, const char *fmt, va_lis
* 1) syslogd was restarted
* 2) /var/run/log is out of socket buffer space, which
* in most cases means local DoS.
- * We attempt to reconnect to /var/run/log to take care of
+ * We attempt to reconnect to /var/run/log[priv] to take care of
* case #1 and keep send()ing data to cover case #2
* to give syslogd a chance to empty its socket buffer.
*
@@ -281,13 +281,13 @@ vsyslog(int pri, const char *fmt, va_lis
connectlog();
}
do {
+ if (status == CONNPRIV)
+ break;
_usleep(1);
if (send(LogFile, tbuf, cnt, 0) >= 0) {
THREAD_UNLOCK();
return;
}
- if (status == CONNPRIV)
- break;
} while (errno == ENOBUFS);
} else {
THREAD_UNLOCK();
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
