Compare commits

...

4 Commits

Author SHA1 Message Date
Mark Andrews
2224022297 add --with-geoip2 to CI 2019-07-02 12:00:15 +10:00
Mark Andrews
f812ef5f44 add --without-geoip2 2019-07-02 11:56:51 +10:00
Mark Andrews
c945a0c1db add missing break 2019-07-02 11:56:51 +10:00
Mark Andrews
31775074b7 test --with-geoip 2019-07-01 23:05:07 +10:00
2 changed files with 45 additions and 0 deletions

View File

@@ -476,3 +476,47 @@ unit:pkcs11:sid:amd64:
<<: *unit_test_job
dependencies:
- pkcs11:sid:amd64
# Jobs for testing --with-geoip builds on Debian Sid (amd64)
geoip:sid:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--without-geoip2 --with-geoip"
<<: *debian_sid_amd64_image
<<: *build_job
system:geoip:sid:amd64:
<<: *debian_sid_amd64_image
<<: *system_test_job
dependencies:
- pkcs11:sid:amd64
unit:geoip:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- pkcs11:sid:amd64
# Jobs for testing --with-geoip2 builds on Debian Sid (amd64)
geoip2:sid:amd64:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--without-geoip --with-geoip2"
<<: *debian_sid_amd64_image
<<: *build_job
system:geoip2:sid:amd64:
<<: *debian_sid_amd64_image
<<: *system_test_job
dependencies:
- pkcs11:sid:amd64
unit:geoip2:sid:amd64:
<<: *debian_sid_amd64_image
<<: *unit_test_job
dependencies:
- pkcs11:sid:amd64

View File

@@ -820,6 +820,7 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) {
case dns_geoip_netspeed_id:
if (ctx->geoip->netspeed != NULL)
return (true);
break;
/*
* The following enums are only valid with GeoIP2,
* not legacy GeoIP.