Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix global option inheritance in unix socket sources #896

Merged
merged 2 commits into from Feb 3, 2016

Conversation

MrAnno
Copy link
Collaborator

@MrAnno MrAnno commented Feb 3, 2016

Fixes: #894

The global create-dirs and pass-unix-credentials options were not
inherited in afunix-source if the options{}; block was positioned lower in the
configuration file than the given module declaration.

This pull request fixes this issue by moving the "inheritance" assignment from
afunix_sd_new_instance to afunix_sd_init.

@MrAnno MrAnno changed the title afsocket: fix global option inheritance Fix global option inheritance in afunix-source Feb 3, 2016
@bazsi
Copy link
Collaborator

bazsi commented Feb 3, 2016

👍

@MrAnno MrAnno force-pushed the afsocket-globalcfg-inher-fix branch from f49162c to 420e9ce Compare February 3, 2016 13:13
The global `create-dirs` option was not inherited in afunix-source
if the `options{};` block was positioned lower in the
configuration file than the given module declaration.

This commit fixes this issue by moving the "inheritance" assignment from
`afunix_sd_new_instance` to `afunix_sd_init`.

Signed-off-by: László Várady <laszlo.varady@balabit.com>
The global `pass-unix-credentials` option was not inherited in afunix-source
if the `options{};` block was positioned lower in the
configuration file than the given module declaration.

This commit fixes this issue by moving the "inheritance" assignment from
`afunix_sd_new_instance` to `afunix_sd_init`.

Signed-off-by: László Várady <laszlo.varady@balabit.com>
@nvxxu2i
Copy link
Contributor

nvxxu2i commented Feb 3, 2016

👍 , and thank you for the separated commits.

@ihrwein
Copy link
Contributor

ihrwein commented Feb 3, 2016

👍 thanks!

ihrwein added a commit that referenced this pull request Feb 3, 2016
Fix global option inheritance in afunix-source
@ihrwein ihrwein merged commit 2e751f9 into syslog-ng:master Feb 3, 2016
@bkil-syslogng
Copy link
Contributor

👍

@MrAnno MrAnno changed the title Fix global option inheritance in afunix-source Fix global option inheritance in unix socket sources Feb 10, 2016
@MrAnno MrAnno added this to the syslog-ng-3.8beta1 milestone Mar 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Global option inheritance problem in afunix-source
5 participants