Skip to content

Commit

Permalink
Merge branch 'master' into schedule-permission
Browse files Browse the repository at this point in the history
  • Loading branch information
timopollmeier authored Apr 30, 2020
2 parents a61cef3 + c61a234 commit aa5d0ca
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Clean up NVTs set to name in cleanup-result-nvts [#1039](https://github.com/greenbone/gvmd/pull/1039)
- Improve validation of note and override ports [#1045](https://github.com/greenbone/gvmd/pull/1045)
- The internal list of current Local Security Checks for the Auto-FP feature was updated [#1054](https://github.com/greenbone/gvmd/pull/1054)
- Do not ignore empty hosts_allow and ifaces_allow [#1064](https://github.com/greenbone/gvmd/pull/1064)

### Fixed
- Add NULL check in nvts_feed_version_epoch [#768](https://github.com/greenbone/gvmd/pull/768)
Expand Down Expand Up @@ -105,6 +106,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Use correct elements to get task ID in wizards [#1004](https://github.com/greenbone/gvmd/pull/1004) [#1046](https://github.com/greenbone/gvmd/pull/1046)
- Use current row for iterator_null, instead of first row [#1047](https://github.com/greenbone/gvmd/pull/1047)
- Setup general task preferences to launch an osp openvas task. [#1055](https://github.com/greenbone/gvmd/pull/1055)
- Fix doc of get_tasks in GMP doc [#1066](https://github.com/greenbone/gvmd/pull/1066)

### Removed
- Remove support for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)
Expand Down
14 changes: 10 additions & 4 deletions src/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -4063,8 +4063,11 @@ add_user_scan_preferences (GHashTable *scanner_options)
else
name = NULL;

if (name)
g_hash_table_replace (scanner_options, name, hosts);
if (name
&& (hosts_allow || (hosts && strlen (hosts))))
g_hash_table_replace (scanner_options,
name,
hosts ? hosts : g_strdup (""));
else
g_free (hosts);

Expand All @@ -4079,8 +4082,11 @@ add_user_scan_preferences (GHashTable *scanner_options)
else
name = NULL;

if (name)
g_hash_table_replace (scanner_options, name, ifaces);
if (name
&& (ifaces_allow || (ifaces && strlen (ifaces))))
g_hash_table_replace (scanner_options,
name,
ifaces ? ifaces : g_strdup (""));
else
g_free (ifaces);
}
Expand Down
2 changes: 1 addition & 1 deletion src/schema_formats/XML/GMP.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -19874,8 +19874,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<summary>Optional usage type to limit the tasks to. Affects total count unlike filter</summary>
<type>
<alts>
<alt>scan</alt>
<alt>audit</alt>
<alt>policy</alt>
<alt></alt>
</alts>
</type>
Expand Down

0 comments on commit aa5d0ca

Please sign in to comment.