Configuration related tweaks #129
Merged
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
|
needs rebase . |
ssahani
reviewed
Nov 5, 2024
src/netlog/netlog-tls.h
Outdated
| @@ -14,7 +14,6 @@ typedef enum OpenSSLCertificateAuthMode { | |||
| OPEN_SSL_CERTIFICATE_AUTH_MODE_DENY = 1 << 2, | |||
| OPEN_SSL_CERTIFICATE_AUTH_MODE_WARN = 1 << 3, | |||
| OPEN_SSL_CERTIFICATE_AUTH_MODE_MAX = 1 << 4, | |||
| OPEN_SSL_CERTIFICATE_AUTH_MODE_INVALID = -1, | |||
| } OpenSSLCertificateAuthMode; | |||
There was a problem hiding this comment.
It's used by the parser. If we give anything which is not expected parser will set it to invalid. Hence we require this in the enum.
There was a problem hiding this comment.
In my testing it doesn't:
The default value gets set via
systemd-netlogd/src/netlog/systemd-netlogd.c
Line 172 in 085384d
at
systemd-netlogd/src/netlog/netlog-manager.c
Line 637 in 085384d
And afterwards the configuration file is parsed at
systemd-netlogd/src/netlog/systemd-netlogd.c
Line 178 in 085384d
and if
TLSCertificateAuthMode= is not specified the value does not change and on an invalid setting, e.g. the empty TLSCertificateAuthMode=, the parser will issue [/etc/systemd/netlogd.conf:4] Failed to parse 'TLSCertificateAuthMode=', ignoring..
In case StructuredData= is set, actually use it and do not override it with the SYSLOG_STRUCTURED_DATA= parsed data. Fixes: 205dbe6 ("Actually respect UseSysLogStructuredData= and UseSysLogMsgId= settings")
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.
No description provided.