keydb.conf: support globbing in include directive#884
Open
blakejalexander wants to merge 1 commit intoSnapchat:mainfrom
Open
keydb.conf: support globbing in include directive#884blakejalexander wants to merge 1 commit intoSnapchat:mainfrom
blakejalexander wants to merge 1 commit intoSnapchat:mainfrom
Conversation
The existing example keydb.conf indicates that wildcard pattern matching is supported for the include directive, i.e. it implies that: - include /etc/keydb.conf - include /etc/keydb.d/server-specific.conf - include /etc/keydb.d/*.conf should all be supported. However, glob-style matching support is not enabled by the configuration parser. This commit treats the arguments to the include directive as glob patterns via the POSIX standard glob.h library, and calls the loadServerConfig function as many times as necessary. Signed-off-by: Blake Alexander <blake.alexander@airbus.com>
989e913 to
bb13a48
Compare
This file contains hidden or 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
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.
The existing example keydb.conf indicates that wildcard pattern matching is supported for the include directive, i.e. it implies that:
should all be supported. However, glob-style matching support is not enabled by the configuration parser. This commit treats the arguments to the include directive as glob patterns via the POSIX standard glob.h library, and calls the loadServerConfig function as many times as necessary - either once (for no pattern), or as many times as there are files matching the pattern.
This is the preferred solution used in other open source projects, see (for example) the implementation in openssh.
This was mentioned in #875 and directly resolves that issue. See also #401 for an earlier discussion.