added initial files for door support & fixed imklog

imklog now basically works, but needs quite some more work to do

7 files changed, 1067 insertions, 48 deletions

diff --git a/Makefile.am b/Makefile.am
index a050e95e..e69349d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,10 @@ if ENABLE_IMKLOG
 SUBDIRS += plugins/imklog
 endif
 
+if ENABLE_IMDOOR
+SUBDIRS += plugins/imdoor
+endif
+
 if ENABLE_GSSAPI
 SUBDIRS += plugins/omgssapi plugins/imgssapi
 endif
diff --git a/configure.ac b/configure.ac
index c24468be..64f4fdc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -715,6 +715,19 @@ AC_ARG_ENABLE(imfile,
 AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes)
 
 
+# settings for the door input module (under solaris, thus default off)
+AC_ARG_ENABLE(imdoor,
+        [AS_HELP_STRING([--enable-imdoor],[door input module enabled @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_imdoor="yes" ;;
+          no) enable_imdoor="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-imdoor) ;;
+         esac],
+        [enable_imdoor=no]
+)
+AM_CONDITIONAL(ENABLE_IMDOOR, test x$enable_imdoor = xyes)
+
+
 # settings for the omprog output module
 AC_ARG_ENABLE(omprog,
         [AS_HELP_STRING([--enable-omprog],[Compiles omprog module @<:@default=no@:>@])],
@@ -816,6 +829,7 @@ AC_CONFIG_FILES([Makefile \
 		plugins/omprog/Makefile \
 		plugins/omstdout/Makefile \
 		plugins/imfile/Makefile \
+		plugins/imdoor/Makefile \
 		plugins/imrelp/Makefile \
 		plugins/imdiag/Makefile \
 		plugins/omtesting/Makefile \
@@ -847,6 +861,7 @@ echo "---{ input plugins }---"
 echo "    Klog functionality enabled:               $enable_klog ($os_type)"
 echo "    imdiag enabled:                           $enable_imdiag"
 echo "    file input module enabled:                $enable_imfile"
+echo "    Solaris door input module enabled:        $enable_imdoor"
 echo "    input template module will be compiled:   $enable_imtemplate"
 echo
 echo "---{ output plugins }---"
diff --git a/plugins/imdoor/Makefile.am b/plugins/imdoor/Makefile.am
new file mode 100644
index 00000000..6ad7a904
--- /dev/null
+++ b/plugins/imdoor/Makefile.am
@@ -0,0 +1,6 @@
+pkglib_LTLIBRARIES = imdoor.la
+
+imdoor_la_SOURCES = imdoor.c sun_cddl.c
+imdoor_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+imdoor_la_LDFLAGS = -module -avoid-version
+imdoor_la_LIBADD = 
diff --git a/plugins/imdoor/imdoor.c b/plugins/imdoor/imdoor.c
new file mode 100644
index 00000000..83890d03
--- /dev/null
+++ b/plugins/imdoor/imdoor.c
@@ -0,0 +1,430 @@
+/* imdoor.c
+ * This input module is used to receive syslog messages via the Solaris
+ * door mechanism. Not surprisingly, it most probably can not be built
+ * on other platforms.
+ *
+ * NOTE: read comments in module-template.h to understand how this file
+ *       works!
+ *
+ * File begun on 2010-03-26 by RGerhards
+ *
+ * Copyright 2010 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include "rsyslog.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include "dirty.h"
+#include "cfsysline.h"
+#include "unicode-helper.h"
+#include "module-template.h"
+#include "srUtils.h"
+#include "errmsg.h"
+#include "net.h"
+#include "glbl.h"
+#include "msg.h"
+#include "prop.h"
+
+MODULE_TYPE_INPUT
+
+/* defines */
+#define MAXFUNIX	20
+#ifndef _PATH_LOG
+#ifdef BSD
+#define _PATH_LOG	"/var/run/log"
+#else
+#define _PATH_LOG	"/dev/log"
+#endif
+#endif
+
+
+/* handle some defines missing on more than one platform */
+#ifndef SUN_LEN
+#define SUN_LEN(su) \
+   (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif
+/* Module static data */
+DEF_IMOD_STATIC_DATA
+DEFobjCurrIf(errmsg)
+DEFobjCurrIf(glbl)
+DEFobjCurrIf(prop)
+
+static prop_t *pInputName = NULL;	/* our inputName currently is always "imuxsock", and this will hold it */
+static int startIndexUxLocalSockets; /* process funix from that index on (used to 
+ 				   * suppress local logging. rgerhards 2005-08-01
+				   * read-only after startup
+				   */
+static int funixParseHost[MAXFUNIX] = { 0, }; /* should parser parse host name?  read-only after startup */
+static int funixFlags[MAXFUNIX] = { IGNDATE, }; /* should parser parse host name?  read-only after startup */
+static uchar *funixn[MAXFUNIX] = { (uchar*) _PATH_LOG }; /* read-only after startup */
+static uchar *funixHName[MAXFUNIX] = { NULL, }; /* host-name override - if set, use this instead of actual name */
+static int funixFlowCtl[MAXFUNIX] = { eFLOWCTL_NO_DELAY, }; /* flow control settings for this socket */
+static int funix[MAXFUNIX] = { -1, }; /* read-only after startup */
+static int nfunix = 1; /* number of Unix sockets open / read-only after startup */
+
+/* config settings */
+static int bOmitLocalLogging = 0;
+static uchar *pLogSockName = NULL;
+static uchar *pLogHostName = NULL;	/* host name to use with this socket */
+static int bUseFlowCtl = 0;		/* use flow control or not (if yes, only LIGHT is used! */
+static int bIgnoreTimestamp = 1; /* ignore timestamps present in the incoming message? */
+
+
+/* set the timestamp ignore / not ignore option for the system
+ * log socket. This must be done separtely, as it is not added via a command
+ * but present by default. -- rgerhards, 2008-03-06
+ */
+static rsRetVal setSystemLogTimestampIgnore(void __attribute__((unused)) *pVal, int iNewVal)
+{
+	DEFiRet;
+	funixFlags[0] = iNewVal ? IGNDATE : NOFLAG;
+	RETiRet;
+}
+
+/* set flowcontrol for the system log socket
+ */
+static rsRetVal setSystemLogFlowControl(void __attribute__((unused)) *pVal, int iNewVal)
+{
+	DEFiRet;
+	funixFlowCtl[0] = iNewVal ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
+	RETiRet;
+}
+
+/* add an additional listen socket. Socket names are added
+ * until the array is filled up. It is never reset, only at
+ * module unload.
+ * TODO: we should change the array to a list so that we
+ * can support any number of listen socket names.
+ * rgerhards, 2007-12-20
+ * added capability to specify hostname for socket -- rgerhards, 2008-08-01
+ */
+static rsRetVal addLstnSocketName(void __attribute__((unused)) *pVal, uchar *pNewVal)
+{
+	if(nfunix < MAXFUNIX) {
+		if(*pNewVal == ':') {
+			funixParseHost[nfunix] = 1;
+		}
+		else {
+			funixParseHost[nfunix] = 0;
+		}
+		funixHName[nfunix] = pLogHostName;
+		pLogHostName = NULL; /* re-init for next, not freed because funixHName[] now owns it */
+		funixFlowCtl[nfunix] = bUseFlowCtl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
+		funixFlags[nfunix] = bIgnoreTimestamp ? IGNDATE : NOFLAG;
+		funixn[nfunix++] = pNewVal;
+	}
+	else {
+		errmsg.LogError(0, NO_ERRCODE, "Out of unix socket name descriptors, ignoring %s\n",
+			 pNewVal);
+	}
+
+	return RS_RET_OK;
+}
+
+/* free the funixn[] socket names - needed as cleanup on several places
+ * note that nfunix is NOT reset! funixn[0] is never freed, as it comes from
+ * the constant memory pool - and if not, it is freeed via some other pointer.
+ */
+static rsRetVal discardFunixn(void)
+{
+	int i;
+
+        for (i = 1; i < nfunix; i++) {
+		if(funixn[i] != NULL) {
+			free(funixn[i]);
+			funixn[i] = NULL;
+		}
+		if(funixHName[i] != NULL) {
+			free(funixHName[i]);
+			funixHName[i] = NULL;
+		}
+	}
+	
+	return RS_RET_OK;
+}
+
+
+static int create_unix_socket(const char *path)
+{
+	struct sockaddr_un sunx;
+	int fd;
+
+	if (path[0] == '\0')
+		return -1;
+
+	unlink(path);
+
+	memset(&sunx, 0, sizeof(sunx));
+	sunx.sun_family = AF_UNIX;
+	(void) strncpy(sunx.sun_path, path, sizeof(sunx.sun_path));
+	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+	if (fd < 0 || bind(fd, (struct sockaddr *) &sunx, SUN_LEN(&sunx)) < 0 ||
+	    chmod(path, 0666) < 0) {
+		errmsg.LogError(errno, NO_ERRCODE, "connot create '%s'", path);
+		dbgprintf("cannot create %s (%d).\n", path, errno);
+		close(fd);
+		return -1;
+	}
+	return fd;
+}
+
+
+/* This function receives data from a socket indicated to be ready
+ * to receive and submits the message received for processing.
+ * rgerhards, 2007-12-20
+ * Interface changed so that this function is passed the array index
+ * of the socket which is to be processed. This eases access to the
+ * growing number of properties. -- rgerhards, 2008-08-01
+ */
+static rsRetVal readSocket(int fd, int iSock)
+{
+	DEFiRet;
+	int iRcvd;
+	int iMaxLine;
+	uchar bufRcv[4096+1];
+	uchar *pRcv = NULL; /* receive buffer */
+
+	assert(iSock >= 0);
+
+	iMaxLine = glbl.GetMaxLine();
+
+	/* we optimize performance: if iMaxLine is below 4K (which it is in almost all
+	 * cases, we use a fixed buffer on the stack. Only if it is higher, heap memory
+	 * is used. We could use alloca() to achive a similar aspect, but there are so
+	 * many issues with alloca() that I do not want to take that route.
+	 * rgerhards, 2008-09-02
+	 */
+	if((size_t) iMaxLine < sizeof(bufRcv) - 1) {
+		pRcv = bufRcv;
+	} else {
+		CHKmalloc(pRcv = (uchar*) malloc(sizeof(uchar) * (iMaxLine + 1)));
+	}
+
+	iRcvd = recv(fd, pRcv, iMaxLine, 0);
+	dbgprintf("Message from UNIX socket: #%d\n", fd);
+	if (iRcvd > 0) {
+		parseAndSubmitMessage(funixHName[iSock] == NULL ? glbl.GetLocalHostName() : funixHName[iSock],
+				      (uchar*)"127.0.0.1", pRcv,
+			 	      iRcvd, funixParseHost[iSock] ? (funixFlags[iSock] | PARSE_HOSTNAME) : funixFlags[iSock],
+				      funixFlowCtl[iSock], pInputName, NULL, 0);
+	} else if (iRcvd < 0 && errno != EINTR) {
+		char errStr[1024];
+		rs_strerror_r(errno, errStr, sizeof(errStr));
+		dbgprintf("UNIX socket error: %d = %s.\n", errno, errStr);
+		errmsg.LogError(errno, NO_ERRCODE, "recvfrom UNIX");
+	}
+
+finalize_it:
+	if(pRcv != NULL && (size_t) iMaxLine >= sizeof(bufRcv) - 1)
+		free(pRcv);
+
+	RETiRet;
+}
+
+
+/* This function is called to gather input. */
+BEGINrunInput
+	int maxfds;
+	int nfds;
+	int i;
+	int fd;
+	fd_set readfds;
+CODESTARTrunInput
+	/* this is an endless loop - it is terminated when the thread is
+	 * signalled to do so. This, however, is handled by the framework,
+	 * right into the sleep below.
+	 */
+	while(1) {
+		/* Add the Unix Domain Sockets to the list of read
+		 * descriptors.
+		 * rgerhards 2005-08-01: we must now check if there are
+		 * any local sockets to listen to at all. If the -o option
+		 * is given without -a, we do not need to listen at all..
+		 */
+	        maxfds = 0;
+	        FD_ZERO (&readfds);
+		/* Copy master connections */
+		for (i = startIndexUxLocalSockets; i < nfunix; i++) {
+			if (funix[i] != -1) {
+				FD_SET(funix[i], &readfds);
+				if (funix[i]>maxfds) maxfds=funix[i];
+			}
+		}
+
+		if(Debug) {
+			dbgprintf("--------imuxsock calling select, active file descriptors (max %d): ", maxfds);
+			for (nfds= 0; nfds <= maxfds; ++nfds)
+				if ( FD_ISSET(nfds, &readfds) )
+					dbgprintf("%d ", nfds);
+			dbgprintf("\n");
+		}
+
+		/* wait for io to become ready */
+		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
+
+		for (i = 0; i < nfunix && nfds > 0; i++) {
+			if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
+				readSocket(fd, i);
+				--nfds; /* indicate we have processed one */
+			}
+		}
+	}
+
+	RETiRet;
+ENDrunInput
+
+
+BEGINwillRun
+CODESTARTwillRun
+	register int i;
+
+	/* first apply some config settings */
+	startIndexUxLocalSockets = bOmitLocalLogging ? 1 : 0;
+	if(pLogSockName != NULL)
+		funixn[0] = pLogSockName;
+
+	/* initialize and return if will run or not */
+	for (i = startIndexUxLocalSockets ; i < nfunix ; i++) {
+		if ((funix[i] = create_unix_socket((char*) funixn[i])) != -1)
+			dbgprintf("Opened UNIX socket '%s' (fd %d).\n", funixn[i], funix[i]);
+	}
+
+	/* we need to create the inputName property (only once during our lifetime) */
+	CHKiRet(prop.Construct(&pInputName));
+	CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imuxsock"), sizeof("imuxsock") - 1));
+	CHKiRet(prop.ConstructFinalize(pInputName));
+
+finalize_it:
+ENDwillRun
+
+
+BEGINafterRun
+CODESTARTafterRun
+	int i;
+	/* do cleanup here */
+	/* Close the UNIX sockets. */
+        for (i = 0; i < nfunix; i++)
+		if (funix[i] != -1)
+			close(funix[i]);
+
+	/* Clean-up files. */
+        for (i = 0; i < nfunix; i++)
+		if (funixn[i] && funix[i] != -1)
+			unlink((char*) funixn[i]);
+	/* free no longer needed string */
+	if(pLogSockName != NULL)
+		free(pLogSockName);
+	if(pLogHostName != NULL) {
+		free(pLogHostName);
+	}
+
+	discardFunixn();
+	nfunix = 1;
+
+	if(pInputName != NULL)
+		prop.Destruct(&pInputName);
+ENDafterRun
+
+
+BEGINmodExit
+CODESTARTmodExit
+	objRelease(glbl, CORE_COMPONENT);
+	objRelease(errmsg, CORE_COMPONENT);
+	objRelease(prop, CORE_COMPONENT);
+ENDmodExit
+
+
+BEGINqueryEtryPt
+CODESTARTqueryEtryPt
+CODEqueryEtryPt_STD_IMOD_QUERIES
+ENDqueryEtryPt
+
+static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal)
+{
+	bOmitLocalLogging = 0;
+	if(pLogSockName != NULL) {
+		free(pLogSockName);
+		pLogSockName = NULL;
+	}
+	if(pLogHostName != NULL) {
+		free(pLogHostName);
+		pLogHostName = NULL;
+	}
+
+	discardFunixn();
+	nfunix = 1;
+	bIgnoreTimestamp = 1;
+	bUseFlowCtl = 0;
+
+	return RS_RET_OK;
+}
+
+
+BEGINmodInit()
+	int i;
+CODESTARTmodInit
+	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
+CODEmodInit_QueryRegCFSLineHdlr
+	CHKiRet(objUse(errmsg, CORE_COMPONENT));
+	CHKiRet(objUse(glbl, CORE_COMPONENT));
+	CHKiRet(objUse(prop, CORE_COMPONENT));
+
+	dbgprintf("imuxsock version %s initializing\n", PACKAGE_VERSION);
+
+	/* initialize funixn[] array */
+	for(i = 1 ; i < MAXFUNIX ; ++i) {
+		funixn[i] = NULL;
+		funix[i]  = -1;
+	}
+
+	/* register config file handlers */
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"omitlocallogging", 0, eCmdHdlrBinary,
+		NULL, &bOmitLocalLogging, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputunixlistensocketignoremsgtimestamp", 0, eCmdHdlrBinary,
+		NULL, &bIgnoreTimestamp, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"systemlogsocketname", 0, eCmdHdlrGetWord,
+		NULL, &pLogSockName, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputunixlistensockethostname", 0, eCmdHdlrGetWord,
+		NULL, &pLogHostName, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputunixlistensocketflowcontrol", 0, eCmdHdlrBinary,
+		NULL, &bUseFlowCtl, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"addunixlistensocket", 0, eCmdHdlrGetWord,
+		addLstnSocketName, NULL, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
+		resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
+	/* the following one is a (dirty) trick: the system log socket is not added via
+	 * an "addUnixListenSocket" config format. As such, it's properties can not be modified
+	 * via $InputUnixListenSocket*". So we need to add a special directive
+	 * for that. We should revisit all of that once we have the new config format...
+	 * rgerhards, 2008-03-06
+	 */
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"systemlogsocketignoremsgtimestamp", 0, eCmdHdlrBinary,
+		setSystemLogTimestampIgnore, NULL, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"systemlogsocketflowcontrol", 0, eCmdHdlrBinary,
+		setSystemLogFlowControl, NULL, STD_LOADABLE_MODULE_ID));
+ENDmodInit
+/* vim:set ai:
+ */
diff --git a/plugins/imdoor/sun_cddl.c b/plugins/imdoor/sun_cddl.c
new file mode 100644
index 00000000..8e9714d9
--- /dev/null
+++ b/plugins/imdoor/sun_cddl.c
@@ -0,0 +1,592 @@
+#define MAXLINE 4096
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/* Portions Copyright 2010 by Rainer Gerhards and Adiscon
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ *      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
+ *      All Rights Reserved
+ */
+
+/*
+ * University Copyright- Copyright (c) 1982, 1986, 1988
+ * The Regents of the University of California
+ * All Rights Reserved
+ *
+ * University Acknowledgment- Portions of this document are derived from
+ * software developed by the University of California, Berkeley, and its
+ * contributors.
+ */
+#include <unistd.h>
+#include <note.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdio_ext.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <signal.h>
+#include <string.h>
+#include <strings.h>
+#include <libscf.h>
+#include <netconfig.h>
+#include <netdir.h>
+#include <pwd.h>
+#include <sys/socket.h>
+#include <tiuser.h>
+#include <utmpx.h>
+#include <limits.h>
+#include <pthread.h>
+#include <fcntl.h>
+#include <stropts.h>
+#include <assert.h>
+#include <sys/statvfs.h>
+
+#include <sys/param.h>
+#include <sys/sysmacros.h>
+#include <sys/syslog.h>
+#include <sys/strlog.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/utsname.h>
+#include <sys/poll.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <sys/mman.h>
+#include <sys/note.h>
+#include <door.h>
+#include <sys/door.h>
+
+#include "rsyslog.h"
+#include "debug.h"
+
+#define	DOORFILE		"/var/run/syslog_door"
+#define	RELATIVE_DOORFILE	"../var/run/syslog_door"
+#define	OLD_DOORFILE		"/etc/.syslog_door"
+
+static int		DoorFd = -1;
+static int		DoorCreated = 0;
+static char		*DoorFileName = DOORFILE;
+
+/* for managing door server threads */
+static pthread_mutex_t door_server_cnt_lock = PTHREAD_MUTEX_INITIALIZER;
+static uint_t door_server_cnt = 0;
+static pthread_attr_t door_thr_attr;
+
+/*
+ * the 'server' function that we export via the door. It does
+ * nothing but return.
+ */
+/*ARGSUSED*/
+static void
+server(void *cookie, char *argp, size_t arg_size,
+    door_desc_t *dp, uint_t n)
+{
+	(void) door_return(NULL, 0, NULL, 0);
+	/* NOTREACHED */
+}
+
+/*ARGSUSED*/
+static void *
+create_door_thr(void *arg)
+{
+	(void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+	(void) door_return(NULL, 0, NULL, 0);
+
+	/*
+	 * If there is an error in door_return(), it will return here and
+	 * the thread will exit. Hence we need to decrement door_server_cnt.
+	 */
+	(void) pthread_mutex_lock(&door_server_cnt_lock);
+	door_server_cnt--;
+	(void) pthread_mutex_unlock(&door_server_cnt_lock);
+	return (NULL);
+}
+
+/*
+ * Max number of door server threads for syslogd. Since door is used
+ * to check the health of syslogd, we don't need large number of
+ * server threads.
+ */
+#define	MAX_DOOR_SERVER_THR	3
+
+/*
+ * Manage door server thread pool.
+ */
+/*ARGSUSED*/
+static void
+door_server_pool(door_info_t *dip)
+{
+	(void) pthread_mutex_lock(&door_server_cnt_lock);
+	if (door_server_cnt <= MAX_DOOR_SERVER_THR &&
+	    pthread_create(NULL, &door_thr_attr, create_door_thr, NULL) == 0) {
+		door_server_cnt++;
+		(void) pthread_mutex_unlock(&door_server_cnt_lock);
+		return;
+	}
+
+	(void) pthread_mutex_unlock(&door_server_cnt_lock);
+}
+
+static void
+delete_doorfiles(void)
+{
+	pthread_t mythreadno;
+	struct stat sb;
+	int err;
+	char line[MAXLINE+1];
+
+	if (Debug) {
+		mythreadno = pthread_self();
+	}
+
+
+	if (lstat(DoorFileName, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
+		if (unlink(DoorFileName) < 0) {
+			err = errno;
+			(void) snprintf(line, sizeof (line),
+			    "unlink() of %s failed - fatal", DoorFileName);
+			errno = err;
+			DBGPRINTF("%s", line);//logerror(line);
+			DBGPRINTF("delete_doorfiles(%u): error: %s, "
+			    "errno=%d\n", mythreadno, line, err);
+			exit(1);
+		}
+
+		DBGPRINTF("delete_doorfiles(%u): deleted %s\n",
+		    mythreadno, DoorFileName);
+	}
+
+	if (strcmp(DoorFileName, DOORFILE) == 0) {
+		if (lstat(OLD_DOORFILE, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
+			if (unlink(OLD_DOORFILE) < 0) {
+				err = errno;
+				(void) snprintf(line, sizeof (line),
+				    "unlink() of %s failed", OLD_DOORFILE);
+				DBGPRINTF("delete_doorfiles(%u): %s\n",
+				    mythreadno, line);
+
+				if (err != EROFS) {
+					errno = err;
+					(void) strlcat(line, " - fatal",
+					    sizeof (line));
+					logerror(line);
+					DBGPRINTF("delete_doorfiles(%u): "
+					    "error: %s, errno=%d\n",
+					    mythreadno, line, err);
+					exit(1);
+				}
+
+				DBGPRINTF("delete_doorfiles(%u): unlink() "
+				    "failure OK on RO file system\n",
+				    mythreadno);
+			}
+
+			DBGPRINTF("delete_doorfiles(%u): deleted %s\n",
+			    mythreadno, OLD_DOORFILE);
+		}
+	}
+
+#if 0
+	if (lstat(PidFileName, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
+		if (unlink(PidFileName) < 0) {
+			err = errno;
+			(void) snprintf(line, sizeof (line),
+			    "unlink() of %s failed - fatal", PidFileName);
+			errno = err;
+			logerror(line);
+			DBGPRINTF("delete_doorfiles(%u): error: %s, "
+			    "errno=%d\n", mythreadno, line, err);
+			exit(1);
+		}
+
+		DBGPRINTF("delete_doorfiles(%u): deleted %s\n", mythreadno,
+		    PidFileName);
+	}
+
+	if (strcmp(PidFileName, PIDFILE) == 0) {
+		if (lstat(OLD_PIDFILE, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
+			if (unlink(OLD_PIDFILE) < 0) {
+				err = errno;
+				(void) snprintf(line, sizeof (line),
+				    "unlink() of %s failed", OLD_PIDFILE);
+				DBGPRINTF(5, "delete_doorfiles(%u): %s, \n",
+				    mythreadno, line);
+
+				if (err != EROFS) {
+					errno = err;
+					(void) strlcat(line, " - fatal",
+					    sizeof (line));
+					logerror(line);
+					DBGPRINTF(1, "delete_doorfiles(%u): "
+					    "error: %s, errno=%d\n",
+					    mythreadno, line, err);
+					exit(1);
+				}
+
+				DBGPRINTF(5, "delete_doorfiles(%u): unlink "
+				    "failure OK on RO file system\n",
+				    mythreadno);
+			}
+
+			DBGPRINTF(5, "delete_doorfiles(%u): deleted %s\n",
+			    mythreadno, OLD_PIDFILE);
+		}
+	}
+#endif
+
+	if (DoorFd != -1) {
+		(void) door_revoke(DoorFd);
+	}
+
+	DBGPRINTF("delete_doorfiles(%u): revoked door: DoorFd=%d\n",
+	    mythreadno, DoorFd);
+}
+
+
+/*
+ * Create the door file and the pid file in /var/run.  If the filesystem
+ * containing /etc is writable, create symlinks /etc/.syslog_door and
+ * /etc/syslog.pid to them.  On systems that do not support /var/run, create
+ * /etc/.syslog_door and /etc/syslog.pid directly.
+ *
+ * Note: it is not considered fatal to fail to create the pid file or its
+ * symlink.  Attempts to use them in the usual way will fail, of course, but
+ * syslogd will function nicely without it (not so for the door file).
+ */
+
+static void
+sun_open_door(void)
+{
+	struct stat buf;
+	door_info_t info;
+	char line[MAXLINE+1];
+	pthread_t mythreadno;
+	int err;
+
+	if (Debug) {
+		mythreadno = pthread_self();
+	}
+
+	/*
+	 * first see if another syslogd is running by trying
+	 * a door call - if it succeeds, there is already
+	 * a syslogd process active
+	 */
+
+	if (!DoorCreated) {
+		int door;
+
+		if ((door = open(DoorFileName, O_RDONLY)) >= 0) {
+			DBGPRINTF("open_door(%u): %s opened "
+			    "successfully\n", mythreadno, DoorFileName);
+
+			if (door_info(door, &info) >= 0) {
+				DBGPRINTF("open_door(%u): "
+				    "door_info:info.di_target = %ld\n",
+				    mythreadno, info.di_target);
+
+				if (info.di_target > 0) {
+					(void) sprintf(line, "syslogd pid %ld"
+					    " already running. Cannot "
+					    "start another syslogd pid %ld",
+					    info.di_target, getpid());
+					DBGPRINTF("open_door(%u): error: "
+					    "%s\n", mythreadno, line);
+					errno = 0;
+					//logerror(line);
+					exit(1);
+				}
+			}
+
+			(void) close(door);
+		} else {
+			if (lstat(DoorFileName, &buf) < 0) {
+				err = errno;
+
+				DBGPRINTF("open_door(%u): lstat() of %s "
+				    "failed, errno=%d\n",
+				    mythreadno, DoorFileName, err);
+
+				if ((door = creat(DoorFileName, 0644)) < 0) {
+					err = errno;
+					(void) snprintf(line, sizeof (line),
+					    "creat() of %s failed - fatal",
+					    DoorFileName);
+					DBGPRINTF("open_door(%u): error: %s, "
+					    "errno=%d\n", mythreadno, line,
+					    err);
+					errno = err;
+					//logerror(line);
+					delete_doorfiles();
+					exit(1);
+				}
+
+				(void) fchmod(door,
+				    S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+
+				DBGPRINTF("open_door(%u): creat() of %s "
+				    "succeeded\n", mythreadno,
+				    DoorFileName);
+
+				(void) close(door);
+			}
+		}
+
+		if (strcmp(DoorFileName, DOORFILE) == 0) {
+			if (lstat(OLD_DOORFILE, &buf) == 0) {
+				DBGPRINTF("open_door(%u): lstat() of %s "
+				    "succeeded\n", mythreadno,
+				    OLD_DOORFILE);
+
+				if (S_ISDIR(buf.st_mode)) {
+					(void) snprintf(line, sizeof (line),
+					    "%s is a directory - fatal",
+					    OLD_DOORFILE);
+					DBGPRINTF("open_door(%u): error: "
+					    "%s\n", mythreadno, line);
+					errno = 0;
+					//logerror(line);
+					delete_doorfiles();
+					exit(1);
+				}
+
+				DBGPRINTF("open_door(%u): %s is not a "
+				    "directory\n",
+				    mythreadno, OLD_DOORFILE);
+
+				if (unlink(OLD_DOORFILE) < 0) {
+					err = errno;
+					(void) snprintf(line, sizeof (line),
+					    "unlink() of %s failed",
+					    OLD_DOORFILE);
+					DBGPRINTF("open_door(%u): %s\n",
+					    mythreadno, line);
+
+					if (err != EROFS) {
+						DBGPRINTF("open_door(%u): "
+						    "error: %s, "
+						    "errno=%d\n",
+						    mythreadno, line, err);
+						(void) strcat(line, " - fatal");
+						errno = err;
+						//logerror(line);
+						delete_doorfiles();
+						exit(1);
+					}
+
+					DBGPRINTF("open_door(%u): unlink "
+					    "failure OK on RO file "
+					    "system\n", mythreadno);
+				}
+			} else {
+				DBGPRINTF("open_door(%u): file %s doesn't "
+				    "exist\n", mythreadno, OLD_DOORFILE);
+			}
+
+			if (symlink(RELATIVE_DOORFILE, OLD_DOORFILE) < 0) {
+				err = errno;
+				(void) snprintf(line, sizeof (line),
+				    "symlink %s -> %s failed", OLD_DOORFILE,
+				    RELATIVE_DOORFILE);
+				DBGPRINTF("open_door(%u): %s\n", mythreadno,
+				    line);
+
+				if (err != EROFS) {
+					DBGPRINTF("open_door(%u): error: %s, "
+					    "errno=%d\n", mythreadno, line,
+					    err);
+					errno = err;
+					(void) strcat(line, " - fatal");
+					//logerror(line);
+					delete_doorfiles();
+					exit(1);
+				}
+
+				DBGPRINTF("open_door(%u): symlink failure OK "
+				    "on RO file system\n", mythreadno);
+			} else {
+				DBGPRINTF("open_door(%u): symlink %s -> %s "
+				    "succeeded\n", mythreadno,
+				    OLD_DOORFILE, RELATIVE_DOORFILE);
+			}
+		}
+
+		if ((DoorFd = door_create(server, 0,
+		    DOOR_REFUSE_DESC)) < 0) {
+		    //???? DOOR_NO_CANEL requires newer libs??? DOOR_REFUSE_DESC | DOOR_NO_CANCEL)) < 0) {
+			err = errno;
+			(void) sprintf(line, "door_create() failed - fatal");
+			DBGPRINTF("open_door(%u): error: %s, errno=%d\n",
+			    mythreadno, line, err);
+			errno = err;
+			//logerror(line);
+			delete_doorfiles();
+			exit(1);
+		}
+		//???? (void) door_setparam(DoorFd, DOOR_PARAM_DATA_MAX, 0);
+		DBGPRINTF("open_door(%u): door_create() succeeded, "
+		    "DoorFd=%d\n", mythreadno, DoorFd);
+
+		DoorCreated = 1;
+	}
+
+	(void) fdetach(DoorFileName);	/* just in case... */
+
+	(void) door_server_create(door_server_pool);
+
+	if (fattach(DoorFd, DoorFileName) < 0) {
+		err = errno;
+		(void) snprintf(line, sizeof (line), "fattach() of fd"
+		    " %d to %s failed - fatal", DoorFd, DoorFileName);
+		DBGPRINTF("open_door(%u): error: %s, errno=%d\n", mythreadno,
+		    line, err);
+		errno = err;
+		//logerror(line);
+		delete_doorfiles();
+		exit(1);
+	}
+
+	DBGPRINTF("open_door(%u): attached server() to %s\n", mythreadno,
+	    DoorFileName);
+
+#if 0
+	/*
+	 * create pidfile anyway, so those using it to control
+	 * syslogd (with kill `cat /etc/syslog.pid` perhaps)
+	 * don't get broken.
+	 */
+
+	if (!PidfileCreated) {
+		int pidfd;
+
+		PidfileCreated = 1;
+
+		if ((pidfd = open(PidFileName, O_RDWR|O_CREAT|O_TRUNC, 0644))
+		    < 0) {
+			err = errno;
+			(void) snprintf(line, sizeof (line),
+			    "open() of %s failed", PidFileName);
+			DBGPRINTF(1, "open_door(%u): warning: %s, errno=%d\n",
+			    mythreadno, line, err);
+			errno = err;
+			//logerror(line);
+			return;
+		}
+
+		(void) fchmod(pidfd, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+		(void) sprintf(line, "%ld\n", getpid());
+
+		if (write(pidfd, line, strlen(line)) < 0) {
+			err = errno;
+			(void) snprintf(line, sizeof (line),
+			    "write to %s on fd %d failed", PidFileName, pidfd);
+			DBGPRINTF(1, "open_door(%u): warning: %s, errno=%d\n",
+			    mythreadno, line, err);
+			errno = err;
+			//logerror(line);
+			return;
+		}
+
+		(void) close(pidfd);
+
+		DBGPRINTF("open_door(%u): %s created\n",
+		    mythreadno, PidFileName);
+
+		if (strcmp(PidFileName, PIDFILE) == 0) {
+			if (lstat(OLD_PIDFILE, &buf) == 0) {
+				DBGPRINTF("open_door(%u): lstat() of %s "
+				    "succeded\n", mythreadno, OLD_PIDFILE);
+
+				if (S_ISDIR(buf.st_mode)) {
+					(void) snprintf(line, sizeof (line),
+					    "file %s is a directory",
+					    OLD_PIDFILE);
+					DBGPRINTF("open_door(%u): warning: "
+					    "%s\n", mythreadno, line);
+					errno = 0;
+					//logerror(line);
+					return;
+				}
+
+				if (unlink(OLD_PIDFILE) < 0) {
+					err = errno;
+					(void) snprintf(line, sizeof (line),
+					    "unlink() of %s failed",
+					    OLD_PIDFILE);
+					DBGPRINTF("open_door(%u): %s\n",
+					    mythreadno, line);
+
+					if (err != EROFS) {
+						DBGPRINTF(1, "open_door (%u): "
+						    "warning: %s, "
+						    "errno=%d\n",
+						    mythreadno, line, err);
+						errno = err;
+						//logerror(line);
+						return;
+					}
+
+					DBGPRINTF(5, "open_door(%u): unlink "
+					    "failure OK on RO file "
+					    "system\n", mythreadno);
+				}
+			} else {
+				DBGPRINTF("open_door(%u): file %s doesn't "
+				    "exist\n", mythreadno, OLD_PIDFILE);
+			}
+
+			if (symlink(RELATIVE_PIDFILE, OLD_PIDFILE) < 0) {
+				err = errno;
+				(void) snprintf(line, sizeof (line),
+				    "symlink %s -> %s failed", OLD_PIDFILE,
+				    RELATIVE_PIDFILE);
+				DBGPRINTF("open_door(%u): %s\n", mythreadno,
+				    line);
+
+				if (err != EROFS) {
+					DBGPRINTF(1, "open_door(%u): warning: "
+					    "%s, errno=%d\n", mythreadno,
+					    line, err);
+					errno = err;
+					//logerror(line);
+					return;
+				}
+
+				DBGPRINTF(5, "open_door(%u): symlink failure OK "
+				    "on RO file system\n", mythreadno);
+				return;
+			}
+
+			DBGPRINTF(5, "open_door(%u): symlink %s -> %s "
+			    "succeeded\n", mythreadno, OLD_PIDFILE,
+			    RELATIVE_PIDFILE);
+		}
+	}
+#endif
+}
+
+
diff --git a/plugins/imklog/solaris.c b/plugins/imklog/solaris.c
index 294efa7c..a0e85dc7 100644
--- a/plugins/imklog/solaris.c
+++ b/plugins/imklog/solaris.c
@@ -51,39 +51,6 @@ static int fklog; // TODO: remove
 #	define _PATH_KLOG "/dev/log"
 #endif
 
-// HELPER
-/* handle some defines missing on more than one platform */
-#ifndef SUN_LEN
-#define SUN_LEN(su) \
-   (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-#endif
-
-int solaris_create_unix_socket(const char *path)
-{
-	struct sockaddr_un sunx;
-	int fd;
-
-return;
-	if (path[0] == '\0')
-		return -1;
-
-	unlink(path);
-
-	memset(&sunx, 0, sizeof(sunx));
-	sunx.sun_family = AF_UNIX;
-	(void) strncpy(sunx.sun_path, path, sizeof(sunx.sun_path));
-	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
-	if (fd < 0 || bind(fd, (struct sockaddr *) &sunx, SUN_LEN(&sunx)) < 0 ||
-	    chmod(path, 0666) < 0) {
-		//errmsg.LogError(errno, NO_ERRCODE, "connot create '%s'", path);
-		dbgprintf("cannot create %s (%d).\n", path, errno);
-		close(fd);
-		return -1;
-	}
-	return fd;
-}
-// END HELPER
-
 
 static uchar *GetPath(void)
 {
@@ -104,7 +71,7 @@ klogWillRun(void)
 		int err = errno;
 perror("XXX");
 		rs_strerror_r(err, errStr, sizeof(errStr));
-		DBGPRINTF("error %d opening log socket %s: %s\n",
+		DBGPRINTF("error %d opening log socket: %s\n",
 				   GetPath(), errStr);
 		iRet = RS_RET_ERR; // TODO: better error code
 	}
diff --git a/plugins/imklog/solaris_cddl.c b/plugins/imklog/solaris_cddl.c
index f45c5e62..700e0ab3 100644
--- a/plugins/imklog/solaris_cddl.c
+++ b/plugins/imklog/solaris_cddl.c
@@ -141,7 +141,7 @@ findnl_bkwd(const char *buf, const size_t len)
 				/*
 				 * Invalid character found.
 				 */
-				dbgprintf("findnl_bkwd(%u): Invalid MB "
+				dbgprintf("klog:findnl_bkwd(%u): Invalid MB "
 				    "sequence\n", mythreadno);
 				/*
 				 * handle as a single byte character.
@@ -184,10 +184,9 @@ sun_openklog(char *name, int mode)
 	int fd;
 	struct strioctl str;
 
-	solaris_create_unix_socket(name);
 	if ((fd = open(name, mode)) < 0) {
 		//logerror("cannot open %s", name);
-		dbgprintf("openklog: cannot open %s (%d)\n",
+		dbgprintf("klog:openklog: cannot open %s (%d)\n",
 		    name, errno);
 		return (-1);
 	}
@@ -197,11 +196,12 @@ sun_openklog(char *name, int mode)
 	str.ic_dp = NULL;
 	if (ioctl(fd, I_STR, &str) < 0) {
 		//logerror("cannot register to log console messages");
-		dbgprintf("openklog: cannot register to log "
+		dbgprintf("klog:openklog: cannot register to log "
 		    "console messages (%d)\n", errno);
 		return (-1);
 	}
 	Pfd.fd = fd;
+	Pfd.events = POLLIN;
 	return (fd);
 }
 
@@ -230,7 +230,7 @@ sun_getkmsg(int timeout)
 		lastline = &dat.buf[dat.len];
 		*lastline = '\0';
 
-		dbgprintf("sys_poll: getmsg: dat.len = %d\n", dat.len);
+		dbgprintf("klog:sys_poll: getmsg: dat.len = %d\n", dat.len);
 		buflen = strlen(buf);
 		len = findnl_bkwd(buf, buflen);
 
@@ -281,11 +281,11 @@ sun_getkmsg(int timeout)
 		 * means that we're done handling all the
 		 * initial messages ready during startup.
 		 */
-		dbgprintf("getkmsg: getmsg: dat.maxlen = %d\n", dat.maxlen);
-		dbgprintf("getkmsg: getmsg: dat.len = %d\n", dat.len);
-		dbgprintf("getkmsg: getmsg: strlen(dat.buf) = %d\n", strlen(dat.buf));
-		dbgprintf("getkmsg: getmsg: dat.buf = \"%s\"\n", dat.buf);
-		dbgprintf("getkmsg: buf len = %d\n", strlen(buf));
+		dbgprintf("klog:getkmsg: getmsg: dat.maxlen = %d\n", dat.maxlen);
+		dbgprintf("klog:getkmsg: getmsg: dat.len = %d\n", dat.len);
+		dbgprintf("klog:getkmsg: getmsg: strlen(dat.buf) = %d\n", strlen(dat.buf));
+		dbgprintf("klog:getkmsg: getmsg: dat.buf = \"%s\"\n", dat.buf);
+		dbgprintf("klog:getkmsg: buf len = %d\n", strlen(buf));
 		//if (timeout == 0) {
 			//formatsys(&hdr, buf, 0);
 			//--sys_init_msg_count++;
@@ -295,7 +295,7 @@ sun_getkmsg(int timeout)
 		Syslog(LOG_INFO, buf);
 	} else if (i < 0 && errno != EINTR) {
 		if(1){ // (!shutting_down) {
-			dbgprintf("kernel log driver read error");
+			dbgprintf("klog:kernel log driver read error");
 		}
 		// TODO trigger retry logic
 		//(void) close(Pfd.fd);
@@ -304,6 +304,7 @@ sun_getkmsg(int timeout)
 }
 
 
+#if 0
 /*
  * Open the log device, and pull up all pending messages.
  */
@@ -335,12 +336,14 @@ sun_prepare_sys_poll()
 			sun_getkmsg(0);
 		} else if (Pfd.revents & (POLLNVAL|POLLHUP|POLLERR)) {
 			//logerror("kernel log driver poll error");
-			dbgprintf("kernel log driver poll error");
+			dbgprintf("klog:kernel log driver poll error");
 			break;
 		}
 	}
 
 }
+#endif
+
 
 /*
  * this thread listens to the local stream log driver for log messages
@@ -353,7 +356,7 @@ sun_sys_poll(void *ap)
 {
 	int nfds;
 
-	dbgprintf("sys_poll: sys_thread started\n");
+	dbgprintf("klog:sys_poll: sys_thread started\n");
 
 	/*
 	 * Try to process as many messages as we can without blocking on poll.
@@ -366,15 +369,17 @@ sun_sys_poll(void *ap)
 
 	for (;;) {
 		errno = 0;
+dbgprintf("XXX: before poll\n");
 
 		nfds = poll(&Pfd, 1, INFTIM);
+dbgprintf("XXX: after poll, nfds %d\n", nfds);
 
 		if (nfds == 0)
 			continue;
 
 		if (nfds < 0) {
 			if (errno != EINTR)
-				dbgprintf("poll error");// logerror("poll");
+				dbgprintf("klog:poll error");// logerror("poll");
 			continue;
 		}
 		if (Pfd.revents & POLLIN) {