Skip to content

Commit

Permalink
Merge pull request #1657 from greenbone/mergify/bp/gvmd-21.04/pr-1655
Browse files Browse the repository at this point in the history
Always quote C collation (backport #1655)
  • Loading branch information
bjoernricks authored Aug 2, 2021
2 parents dbe1d6e + 7b8e2bb commit a93a8da
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Fix VTs hash check and add --dump-vt-verification [#1611](https://github.com/greenbone/gvmd/pull/1611) [#1629](https://github.com/greenbone/gvmd/pull/1629)
- Solved a performance problem when filtering results by tags [#1579](https://github.com/greenbone/gvmd/pull/1579)
- Fix VTs hash check and add --dump-vt-verification [#1611](https://github.com/greenbone/gvmd/pull/1611) [#1629](https://github.com/greenbone/gvmd/pull/1629) [#1643](https://github.com/greenbone/gvmd/pull/1643) [1541](https://github.com/greenbone/gvmd/pull/1651)
- Fix VTs hash check and add --dump-vt-verification
[#1611](https://github.com/greenbone/gvmd/pull/1611)
[#1629](https://github.com/greenbone/gvmd/pull/1629)
[#1641](https://github.com/greenbone/gvmd/pull/1651)
[#1643](https://github.com/greenbone/gvmd/pull/1643)
[#1655](https://github.com/greenbone/gvmd/pull/1655)
- Fix memory errors in modify_permission [#1613](https://github.com/greenbone/gvmd/pull/1613)
- Fix sensor connection for performance reports on failure [#1633](https://github.com/greenbone/gvmd/pull/1633)
- Sort the "host" column by IPv4 address if possible [#1637](https://github.com/greenbone/gvmd/pull/1637)
Expand Down
5 changes: 4 additions & 1 deletion src/manage_pg.c
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,10 @@ manage_create_sql_functions ()
|| g_str_match_string ("UTF8", encoding, 0))
quoted_collation = strdup ("ucs_basic");
else
quoted_collation = strdup ("C");
// quote C collation because this seems to be required
// without quoting it an error is raised
// other collations don't need quoting
quoted_collation = strdup ("\"C\"");

free (encoding);
}
Expand Down

0 comments on commit a93a8da

Please sign in to comment.