fix for "configure add" handling of quotes in strings#764
Merged
joergsteffens merged 3 commits intobareos:masterfrom Apr 1, 2021
Conversation
42e8cfb to
382251d
Compare
382251d to
8acd18b
Compare
a78fdf6 to
d4d0567
Compare
pstorz
reviewed
Mar 23, 2021
a49052d to
602dcf3
Compare
f2e9aed to
51f366f
Compare
51f366f to
2e795c0
Compare
2e795c0 to
c11a77e
Compare
joergsteffens
approved these changes
Mar 24, 2021
Member
joergsteffens
left a comment
There was a problem hiding this comment.
Looks good. Automatic and manual testing succeeded.
joergsteffens
requested changes
Mar 24, 2021
Member
joergsteffens
left a comment
There was a problem hiding this comment.
Unfortenatly I see now, that compilation fails on some platforms, namely:
- Debian_9.0.i586
- Debian_9.0.x86_64
- Univention_4.4.x86_64 (might also be based on Debian 9)
- FreeBSD_12.2.amd64
The error always looks similar to this:
[2021-03-24T15:33:33.312Z] ../../../../core/src/dird/ua_configure.cc: In function ‘bool directordaemon::config_add_directive(directordaemon::UaContext*, ResourceTable*, const char*, const char*, PoolMem&, int)’:
[2021-03-24T15:33:33.312Z] ../../../../core/src/dird/ua_configure.cc:142:9: error: invalid use of template-name ‘std::array’ without an argument list
[2021-03-24T15:33:33.312Z] const std::array quotable_types{
[2021-03-24T15:33:33.312Z] ^~~
[2021-03-24T15:33:33.312Z] In file included from /usr/include/c++/6/tuple:39:0,
[2021-03-24T15:33:33.312Z] from /usr/include/c++/6/bits/stl_map.h:63,
[2021-03-24T15:33:33.312Z] from /usr/include/c++/6/map:61,
[2021-03-24T15:33:33.312Z] from ../../../../core/src/include/bareos.h:184,
[2021-03-24T15:33:33.312Z] from ../../../../core/src/dird/ua_configure.cc:29:
[2021-03-24T15:33:33.312Z] /usr/include/c++/6/array:90:12: note: ‘template<class _Tp, unsigned int _Nm> struct std::array’ declared here
5fe8197 to
2372343
Compare
joergsteffens
approved these changes
Mar 29, 2021
2372343 to
e538b86
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
3 participants
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.
Thank you for contributing to the Bareos Project!
Description
When adding resources using the
configure addcommand, quoted strings and escaped quotes in script commands were not registered correctly, leading to configuration files containing wrong or incomplete data in certain situations. This PR aims to fix those issues.Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
General
Source code quality
check-sources --since-mergedoes not report any problemsgit statusshould not report modifications in the source tree after building and testingTests