Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert port lists to new 'pick from parsed' style #950

Merged
merged 5 commits into from
Jan 22, 2020
Merged

Convert port lists to new 'pick from parsed' style #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b8d138
Move is_uuid to utils
mattmundell Jan 21, 2020
8c12e7c
Use 'pick from parsed' style for port lists
mattmundell Jan 21, 2020
10860d4
Update changelog
mattmundell Jan 21, 2020
81d36d2
Merge branch 'master' into pick-port-lists
mattmundell Jan 21, 2020
75e2bef
Add missing includes
mattmundell Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add "Base" scan config [#862](https://github.com/greenbone/gvmd/pull/862)
- Add setting "BPM Data" [#915](https://github.com/greenbone/gvmd/pull/915)
- Automatically load predefined configs from the feed [#931](https://github.com/greenbone/gvmd/pull/931) [#933](https://github.com/greenbone/gvmd/pull/933) [#934](https://github.com/greenbone/gvmd/pull/934)
- Automatically load predefined port lists from the feed [#950](https://github.com/greenbone/gvmd/pull/950)

### Changed
- Update SCAP and CERT feed info in sync scripts [#810](https://github.com/greenbone/gvmd/pull/810)
Expand Down
9 changes: 5 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ add_executable (manage-utils-test
sql_pg.c manage_pg.c
lsc_user.c lsc_crypt.c utils.c
gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
gmp_tickets.c gmp_tls_certificates.c)
gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)

add_test (manage-utils-test manage-utils-test)

Expand All @@ -132,7 +132,7 @@ add_executable (manage-test
sql_pg.c manage_pg.c
lsc_user.c lsc_crypt.c utils.c
gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
gmp_tickets.c gmp_tls_certificates.c)
gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)

add_test (manage-test manage-test)

Expand All @@ -156,7 +156,7 @@ add_executable (gmp-tickets-test
sql_pg.c manage_pg.c
lsc_user.c lsc_crypt.c utils.c
gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
gmp_tls_certificates.c)
gmp_port_lists.c gmp_tls_certificates.c)

add_test (gmp-tickets-test gmp-tickets-test)

Expand Down Expand Up @@ -187,7 +187,7 @@ add_executable (gvmd
sql_pg.c manage_pg.c
lsc_user.c lsc_crypt.c utils.c
gmp.c gmp_base.c gmp_configs.c gmp_delete.c gmp_get.c
gmp_tickets.c gmp_tls_certificates.c)
gmp_port_lists.c gmp_tickets.c gmp_tls_certificates.c)

target_link_libraries (gvmd m
${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
Expand Down Expand Up @@ -367,6 +367,7 @@ set (C_FILES "${CMAKE_CURRENT_SOURCE_DIR}/gvmd.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_delete.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_get.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_configs.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_port_lists.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_tickets.c"
"${CMAKE_CURRENT_SOURCE_DIR}/gmp_tls_certificates.c"
"${CMAKE_CURRENT_SOURCE_DIR}/manage.c"
Expand Down
Loading