autoconf: #define the expanded version of localstatedir #12613
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously we defined LOCAL_STATE_DIR on the command line which relied
on shell expansion, now that we define it in autoconf.h we have to
expand it ourselves first. This broke the creation of the default unix
socket directory and file.
Without this commit autoconf.h contains:
#define LOCAL_STATE_DIR "${prefix}/var"
now it will contain:
#define LOCAL_STATE_DIR "/var/run/suricata"
(prefix respecting of course)
Fixes commit b6a610d.
| @@ -2508,7 +2508,7 @@ AC_SUBST(e_logcertsdir) | |||
| AC_SUBST(e_sysconfdir) | |||
| AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR]) | |||
| AC_SUBST(e_localstatedir) | |||
| AC_DEFINE_UNQUOTED([LOCAL_STATE_DIR],["$localstatedir"],[Our LOCAL_STATE_DIR]) | |||
There was a problem hiding this comment.
I used localstatedir as it contains "/var", where e_localstatedir will contain "/var/lib/suricata" iirc. See the failing CI checks output.
There was a problem hiding this comment.
Oops, yeah. e_localstatedir should actually be e_projectstatedir or something and e_localstatedir should be nothing more than the expansion of localstatedir.
|
Replaced by #12619. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we defined LOCAL_STATE_DIR on the command line which relied
on shell expansion, now that we define it in autoconf.h we have to
expand it ourselves first. This broke the creation of the default unix
socket directory and file.
Without this commit autoconf.h contains:
now it will contain:
(prefix respecting of course)
Fixes commit b6a610d.