Attachment 786 Details for Bug 973 – force reopen of syslog (fixed for openlog_r too)

[patch] force reopen of syslog (fixed for openlog_r too)

openssh-ssh-reinit-syslog.patch (text/plain), 1.10 KB, created by Darren Tucker on 2005-01-24 23:50:13 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-01-24 23:50:13 AEDT

Size: 1.10 KB

patch

obsolete

>Index: log.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/log.c,v
>retrieving revision 1.38
>diff -u -p -r1.38 log.c
>--- log.c	21 Jul 2004 00:52:13 -0000	1.38
>+++ log.c	24 Jan 2005 12:38:53 -0000
>@@ -194,6 +194,9 @@ void
> log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
> {
> 	argv0 = av0;
>+#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
>+	struct syslog_data sdata = SYSLOG_DATA_INIT;
>+#endif
> 
> 	switch (level) {
> 	case SYSLOG_LEVEL_QUIET:
>@@ -261,6 +264,19 @@ log_init(char *av0, LogLevel level, Sysl
> 		    (int) facility);
> 		exit(1);
> 	}
>+
>+	/*
>+	 * If an external library (eg libwrap) attempts to use syslog
>+	 * immediately after reexec, syslog may be pointing to the wrong
>+	 * facility, so we force an open/close of syslog here.
>+	 */
>+#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
>+	openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
>+	closelog_r(&sdata);
>+#else
>+	openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
>+	closelog();
>+#endif
> }
> 
> #define MSGBUFSIZ 1024

Actions: View | Diff

Attachments on bug 973: 769 | 770 | 772 | 773 | 786