lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

[BZ #108]

Browse Source 
Update.
	* misc/syslog.c (openlog_internal): Always try both UDP and TCP.
	[BZ #108]  Patch mainly by Bjorn Andersson <bjorn@iki.fi>.
This commit is contained in:
Ulrich Drepper
2004-08-09 02:50:47 +00:00
parent 0b755dc43f
commit 807645d725
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-08-08 Ulrich Drepper <drepper@redhat.com> 2004-08-08 Ulrich Drepper <drepper@redhat.com>
* misc/syslog.c (openlog_internal): Always try both UDP and TCP.
[BZ #108] Patch mainly by Bjorn Andersson <bjorn@iki.fi>.
* configure.in: Also recognize i786. [BZ #106] * configure.in: Also recognize i786. [BZ #106]
Patch by <pluto@pld-linux.org>. Patch by <pluto@pld-linux.org>.

14
misc/syslog.c
View File

@ -323,7 +323,8 @@ openlog_internal(const char *ident, int logstat, int logfac)
if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0) if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
LogFacility = logfac; LogFacility = logfac;
while (1) { int retry = 0;
while (retry < 2) {
if (LogFile == -1) { if (LogFile == -1) {
SyslogAddr.sa_family = AF_UNIX; SyslogAddr.sa_family = AF_UNIX;
(void)strncpy(SyslogAddr.sa_data, _PATH_LOG, (void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
@ -345,12 +346,13 @@ openlog_internal(const char *ident, int logstat, int logfac)
int fd = LogFile; int fd = LogFile;
LogFile = -1; LogFile = -1;
(void)__close(fd); (void)__close(fd);
if (LogType == SOCK_DGRAM __set_errno (old_errno);
&& saved_errno == EPROTOTYPE) if (saved_errno == EPROTOTYPE)
{ {
/* retry with next SOCK_STREAM: */ /* retry with the other type: */
LogType = SOCK_STREAM; LogType = (LogType == SOCK_DGRAM
__set_errno (old_errno); ? SOCK_STREAM : SOCK_DGRAM);
++retry;
continue; continue;
} }
} else } else