diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
| commit | 9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch) | |
| tree | 10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /runtime | |
| parent | 5416a94bbe9a24ad9236755a9e21944685fc231b (diff) | |
| parent | f7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff) | |
| download | rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/glbl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index 32b85622..7fa61963 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -55,7 +55,7 @@ DEFobjCurrIf(prop) */ static uchar *pszWorkDir = NULL; static int bOptimizeUniProc = 1; /* enable uniprocessor optimizations */ -static int bHUPisRestart = 1; /* should SIGHUP cause a full system restart? */ +static int bHUPisRestart = 0; /* should SIGHUP cause a full system restart? */ static int bPreserveFQDN = 0; /* should FQDNs always be preserved? */ static int iMaxLine = 2048; /* maximum length of a syslog message */ static int iDefPFFamily = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */ @@ -293,7 +293,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a } bDropMalPTRMsgs = 0; bOptimizeUniProc = 1; - bHUPisRestart = 1; + bHUPisRestart = 0; bPreserveFQDN = 0; return RS_RET_OK; } |