Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1171
dird: missing quotes around name when using `configure export`
  • Loading branch information
pstorz committed Apr 26, 2022
2 parents 1f360a3 + d1e44d1 commit 7a07a87
Show file tree
Hide file tree
Showing 10 changed files with 319 additions and 283 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -52,6 +52,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
- cats: make `.bvfs_update` and `.bvfs_versions` take archive jobs into consideration [PR #1152]
- Fix `always-incremental-consolidate` systemtest sporadic fails, and rename it. [PR #1154]
- packaging: FreeBSD place all scripts into "normal" location /usr/local/lib/bareos/scripts [PR #1163]
- [BUG #1445] adding quotes to director name when using `configure export`. [PR #1171]

### Changed
- contrib: rename Python modules to satisfy PEP8 [PR #768]
Expand Down Expand Up @@ -156,5 +157,8 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
[PR #1149]: https://github.com/bareos/bareos/pull/1149
[PR #1152]: https://github.com/bareos/bareos/pull/1152
[PR #1153]: https://github.com/bareos/bareos/pull/1153
[PR #1154]: https://github.com/bareos/bareos/pull/1154
[PR #1155]: https://github.com/bareos/bareos/pull/1155
[PR #1163]: https://github.com/bareos/bareos/pull/1163
[PR #1171]: https://github.com/bareos/bareos/pull/1171
[unreleased]: https://github.com/bareos/bareos/tree/master
6 changes: 4 additions & 2 deletions core/src/dird/ua_configure.cc
@@ -1,7 +1,7 @@
/*
BAREOS® - Backup Archiving REcovery Open Sourced
Copyright (C) 2015-2021 Bareos GmbH & Co. KG
Copyright (C) 2015-2022 Bareos GmbH & Co. KG
This program is Free Software; you can redistribute it and/or
modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -232,7 +232,9 @@ static inline bool ConfigureCreateFdResourceString(UaContext* ua,
password = &client->password_;

resource.strcat("Director {\n");
config_add_directive(NULL, NULL, "Name", me->resource_name_, resource);

Mmsg(temp, "\"%s\"", me->resource_name_);
config_add_directive(NULL, NULL, "Name", temp.c_str(), resource);

switch (password->encoding) {
case p_encoding_clear:
Expand Down

0 comments on commit 7a07a87

Please sign in to comment.