diff options
| author | Michael Biebl <biebl@debian.org> | 2011-02-07 18:00:17 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-02-07 18:00:17 +0100 |
| commit | 537e74be114f1698f9ec825cf8ea497ffc0f17c5 (patch) | |
| tree | f06036c66bfef013978bd8e53fb2a247e8a95842 /tools/syslogd.c | |
| parent | 0a5a3fba01d42ef3b380c4ae27699bb42c3af493 (diff) | |
| download | rsyslog-537e74be114f1698f9ec825cf8ea497ffc0f17c5.tar.gz | |
Imported Upstream version 5.7.3upstream/5.7.3
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 4964f8f..19a5900 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2111,11 +2111,6 @@ static void printVersion(void) #else printf("\tFEATURE_LARGEFILE:\t\t\tNo\n"); #endif -#ifdef USE_NETZIP - printf("\tFEATURE_NETZIP (message compression):\tYes\n"); -#else - printf("\tFEATURE_NETZIP (message compression):\tNo\n"); -#endif #if defined(SYSLOG_INET) && defined(USE_GSSAPI) printf("\tGSSAPI Kerberos 5 support:\t\tYes\n"); #else @@ -2127,9 +2122,14 @@ static void printVersion(void) printf("\tFEATURE_DEBUG (debug build, slow code):\tNo\n"); #endif #ifdef HAVE_ATOMIC_BUILTINS - printf("\tAtomic operations supported:\t\tYes\n"); + printf("\t32bit Atomic operations supported:\tYes\n"); #else - printf("\tAtomic operations supported:\t\tNo\n"); + printf("\t32bit Atomic operations supported:\tNo\n"); +#endif +#ifdef HAVE_ATOMIC_BUILTINS64 + printf("\t64bit Atomic operations supported:\tYes\n"); +#else + printf("\t64bit Atomic operations supported:\tNo\n"); #endif #ifdef RTINST printf("\tRuntime Instrumentation (slow code):\tYes\n"); @@ -2592,7 +2592,7 @@ int realMain(int argc, char **argv) } } - if ((argc -= optind)) + if(argc - optind) usage(); DBGPRINTF("rsyslogd %s startup, compatibility mode %d, module path '%s', cwd:%s\n", @@ -2868,9 +2868,6 @@ int realMain(int argc, char **argv) if(!iConfigVerify) CHKiRet(doGlblProcessInit()); - /* re-generate local host name property, as the config may have changed our FQDN settings */ - glbl.GenerateLocalHostNameProperty(); - CHKiRet(mainThread()); /* do any de-init's that need to be done AFTER this comment */ |