Skip to content

Commit

Permalink
Merge pull request #950 from mattmundell/pick-port-lists
Browse files Browse the repository at this point in the history
Convert port lists to new 'pick from parsed' style
  • Loading branch information
timopollmeier authored Jan 22, 2020
2 parents 3fea80d + 75e2bef commit 252320d
Show file tree
Hide file tree
Showing 7 changed files with 532 additions and 490 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit 252320d

Please sign in to comment.