diff options
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 73 |
1 files changed, 2 insertions, 71 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index ec0beb7..ac45775 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -134,13 +134,8 @@ void rsyslogdDebugSwitch(); void rsyslogdDoDie(int sig); -#if defined(SYSLOGD_PIDNAME) -# undef _PATH_LOGPID -# define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME -#else -# ifndef _PATH_LOGPID -# define _PATH_LOGPID "/etc/rsyslogd.pid" -# endif +#ifndef _PATH_LOGPID +# define _PATH_LOGPID "/var/run/rsyslogd.pid" #endif #ifndef _PATH_TTY @@ -325,70 +320,6 @@ void syslogd_sighup_handler() sigaction(SIGHUP, &sigAct, NULL); } -/* print version and compile-time setting information. - */ -void syslogd_printVersion(void) -{ - printf("rsyslogd %s, ", VERSION); - printf("compiled with:\n"); -#ifdef FEATURE_REGEXP - printf("\tFEATURE_REGEXP:\t\t\t\tYes\n"); -#else - printf("\tFEATURE_REGEXP:\t\t\t\tNo\n"); -#endif -/* Yann Droneaud <yann@droneaud.fr> contribution */ -#if defined(_LARGE_FILES) || (defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS >= 64) -/* end Yann Droneaud <yann@droneaud.fr> contribution */ - printf("\tFEATURE_LARGEFILE:\t\t\tYes\n"); -#else - printf("\tFEATURE_LARGEFILE:\t\t\tNo\n"); -#endif -#if defined(SYSLOG_INET) && defined(USE_GSSAPI) - printf("\tGSSAPI Kerberos 5 support:\t\tYes\n"); -#else - printf("\tGSSAPI Kerberos 5 support:\t\tNo\n"); -#endif -#ifndef NDEBUG - printf("\tFEATURE_DEBUG (debug build, slow code):\tYes\n"); -#else - printf("\tFEATURE_DEBUG (debug build, slow code):\tNo\n"); -#endif -#ifdef HAVE_ATOMIC_BUILTINS - printf("\t32bit Atomic operations supported:\tYes\n"); -#else - printf("\t32bit Atomic operations supported:\tNo\n"); -#endif -/* mono_matsuko <aiueov@hotmail.co.jp> contribution */ -#ifdef HAVE_ATOMIC_BUILTINS_64BIT -/* end mono_matsuko <aiueov@hotmail.co.jp> contribution */ - printf("\t64bit Atomic operations supported:\tYes\n"); -#else - printf("\t64bit Atomic operations supported:\tNo\n"); -#endif -#ifdef HAVE_JEMALLOC - printf("\tmemory allocator:\t\t\tjemalloc\n"); -#else - printf("\tmemory allocator:\t\t\tsystem default\n"); -#endif -#ifdef RTINST - printf("\tRuntime Instrumentation (slow code):\tYes\n"); -#else - printf("\tRuntime Instrumentation (slow code):\tNo\n"); -#endif -#ifdef USE_LIBUUID - printf("\tuuid support:\t\t\t\tYes\n"); -#else - printf("\tuuid support:\t\t\t\tNo\n"); -#endif -#ifdef HAVE_JSON_OBJECT_NEW_INT64 - printf("\tNumber of Bits in RainerScript integers: 64\n"); -#else - printf("\tNumber of Bits in RainerScript integers: 32 (due to too-old json-c lib)\n"); -#endif - printf("\nSee http://www.rsyslog.com for more information.\n"); -} - - /* obtain ptrs to all clases we need. */ rsRetVal syslogd_obtainClassPointers(void) |