diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
| commit | 223439934c20f38bc00ec5287124737932d33ddb (patch) | |
| tree | 83f1b2b82271574ddd503ab1c43049b86817f839 /plugins/imudp/imudp.c | |
| parent | 785e0c3c8b00614b6f780f902442025f4558a160 (diff) | |
| parent | 906ed9df906fe3a52b042929130e6fc9a00b53a8 (diff) | |
| download | rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.gz rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.bz2 rsyslog-223439934c20f38bc00ec5287124737932d33ddb.zip | |
Merge branch 'master' into master-gt
Conflicts:
configure.ac
runtime/rsyslog.h
Diffstat (limited to 'plugins/imudp/imudp.c')
| -rw-r--r-- | plugins/imudp/imudp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index dde8f105..7e11a80e 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -853,7 +853,6 @@ CODESTARTactivateCnfPrePrivDrop ABORT_FINALIZE(RS_RET_NO_RUN); } - setSchedParams(pModConf); finalize_it: ENDactivateCnfPrePrivDrop @@ -886,6 +885,15 @@ ENDfreeCnf */ BEGINrunInput CODESTARTrunInput + /* Note well: the setting of scheduling parameters will not work + * when we dropped privileges (if the user is not sufficently + * privileged, of course). Howerver, we can't change the + * scheduling params in PrePrivDrop(), as at that point our thread + * is not yet created. So at least as an interim solution, we do + * NOT support both setting sched parameters and dropping + * privileges within the same instance. + */ + setSchedParams(runModConf); iRet = rcvMainLoop(pThrd); ENDrunInput |