summaryrefslogtreecommitdiffstats
path: root/plugins/imsolaris
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-19 12:00:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-19 12:00:06 +0200
commit9039fad4019cb9a0f96eb296835476841b453dd3 (patch)
treef09be878ea6f3d6ad2e14d28dae043247dadd96c /plugins/imsolaris
parent71406206d5e35cc4d4648b8dc5fe7cd295e5778b (diff)
downloadrsyslog-9039fad4019cb9a0f96eb296835476841b453dd3.tar.gz
rsyslog-9039fad4019cb9a0f96eb296835476841b453dd3.tar.xz
rsyslog-9039fad4019cb9a0f96eb296835476841b453dd3.zip
some more cleanup
Diffstat (limited to 'plugins/imsolaris')
-rw-r--r--plugins/imsolaris/Makefile.am2
-rw-r--r--plugins/imsolaris/imsolaris.h1
-rw-r--r--plugins/imsolaris/sun_cddl.c37
3 files changed, 11 insertions, 29 deletions
diff --git a/plugins/imsolaris/Makefile.am b/plugins/imsolaris/Makefile.am
index 2980fc6f..b4ee1c29 100644
--- a/plugins/imsolaris/Makefile.am
+++ b/plugins/imsolaris/Makefile.am
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = imsolaris.la
-imsolaris_la_SOURCES = imsolaris.c sun_cddl.c sun_cddl.h
+imsolaris_la_SOURCES = imsolaris.c sun_cddl.c sun_cddl.h imsolaris.h
imsolaris_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
imsolaris_la_LDFLAGS = -module -avoid-version
imsolaris_la_LIBADD = -ldoor -lpthread
diff --git a/plugins/imsolaris/imsolaris.h b/plugins/imsolaris/imsolaris.h
new file mode 100644
index 00000000..9637220b
--- /dev/null
+++ b/plugins/imsolaris/imsolaris.h
@@ -0,0 +1 @@
+rsRetVal solaris_readLog(int fd);
diff --git a/plugins/imsolaris/sun_cddl.c b/plugins/imsolaris/sun_cddl.c
index 0d18f972..69636df0 100644
--- a/plugins/imsolaris/sun_cddl.c
+++ b/plugins/imsolaris/sun_cddl.c
@@ -1,4 +1,3 @@
-#define MAXLINE 4096
/*
* CDDL HEADER START
*
@@ -41,53 +40,37 @@
* 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 "srUtils.h"
#include "debug.h"
+#include "imsolaris.h"
#define DOORFILE "/var/run/syslog_door"
#define RELATIVE_DOORFILE "../var/run/syslog_door"
#define OLD_DOORFILE "/etc/.syslog_door"
+/* Buffer to allocate for error messages: */
+#define ERRMSG_LEN 1024
+
static struct pollfd Pfd; /* Pollfd for local the log device */
static int DoorFd = -1;
@@ -159,7 +142,7 @@ sun_delete_doorfiles(void)
{
struct stat sb;
int err;
- char line[MAXLINE+1];
+ char line[ERRMSG_LEN+1];
if (lstat(DoorFileName, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
if (unlink(DoorFileName) < 0) {
@@ -218,19 +201,17 @@ sun_delete_doorfiles(void)
* to them. On systems that do not support /var/run, create
* /etc/.syslog_door directly.
*/
-
void
sun_open_door(void)
{
struct stat buf;
door_info_t info;
- char line[MAXLINE+1];
+ char line[ERRMSG_LEN+1];
int err;
- /*
- * first see if another syslogd is running by trying
- * a door call - if it succeeds, there is already
- * a syslogd process active
+ /* first see if another instance of imsolaris OR another
+ * syslogd is running by trying a door call - if it succeeds,
+ * there is already one active.
*/
if (!DoorCreated) {