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

make sure all path/dir variables are defined in a single location, by configure.ac #911

Merged
merged 4 commits into from
Feb 10, 2016

Conversation

bazsi
Copy link
Collaborator

@bazsi bazsi commented Feb 9, 2016

This one should be a partial fix to #908 as it doesn't yet fix xsddir, but it does for scldir and config_includedir

NOTE: YOU CAN GET SEGFAULTS after merging this in a development environment: I've found a segfault in the lexer if two instances of scl/system/plugin.conf is included into the same config. I'm still diagnosing that issue, but I wanted to get this in.

This variable points to the root of the include directory.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
This patch AC_DEFINEs PATH_SCLDIR, which earlier has only been an AC_SUBST
variable.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
Instead of reconstructing the proper paths from scl.conf, publish the
actual configure.ac defined values, so those are really defined at
a single location.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
@bazsi
Copy link
Collaborator Author

bazsi commented Feb 9, 2016

So the segfault happens when the plugin.conf is found two times, once in the old and once in the new location both included due to the wildcard import.

This should not happen in production but might if you install syslog-ng from source without uninstalling the old scl files first.

Instead of open coding the path to the XML schema installation directory,
do it in configure.ac.

Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
@bazsi
Copy link
Collaborator Author

bazsi commented Feb 9, 2016

I have now added support for xsddir as pointed out by a comment in PR #882, so this PR should solve all of the problems caused by PR #882.

As there's an actual breakage in current master, merging this should be a priority.

Please review and merge.

@czanik pls try if this solves your problem.

@bazsi bazsi changed the title Define include/scl directories by the SCL make sure all path/dir variables are defined in a single location, by configure.ac Feb 9, 2016
lbudai added a commit that referenced this pull request Feb 10, 2016
make sure all path/dir variables are defined in a single location, by configure.ac
@lbudai lbudai merged commit dfd5db4 into master Feb 10, 2016
@czanik
Copy link
Collaborator

czanik commented Feb 10, 2016

@bazsi Thanks, just tested and it seems to have fixed my problems. I have now other problems, but most likely unrelated.

@bazsi bazsi deleted the f/fix-include-path branch August 15, 2017 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants