fix a bug that could cause an assert when configuring "geoip continent"

- incidentally fixed some typos in log messages

(cherry picked from commit 326349228aa8569abcb36eec843783753a60632e)

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index a2f2d0f0b02b537dcb946f2998f62f9677890a1e..ece117bb90c2fb29bc1f2a017de888bbdf0fd0f7 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -603,7 +603,7 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx,
                                sizeof(de.geoip_elem.as_string));
                } else {
                        cfg_obj_log(obj, lctx, ISC_LOG_ERROR,
-                                   "geoiop postal code (%s) too long",
+                                   "geoip postal code (%s) too long",
                                    search);
                        return (ISC_R_FAILURE);
                }
@@ -832,7 +832,7 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) {
        case dns_geoip_netspeed_id:
                if (ctx->geoip->netspeed != NULL)
                        return (true);
-               /* FALLTHROUGH */
+               break;
        /*
         * The following enums are only valid with GeoIP2,
         * not legacy GeoIP.
@@ -932,7 +932,7 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx,
                                sizeof(de.geoip_elem.as_string));
                } else {
                        cfg_obj_log(obj, lctx, ISC_LOG_ERROR,
-                                   "geoiop postal code (%s) too long",
+                                   "geoip postal code (%s) too long",
                                    search);
                        return (ISC_R_FAILURE);
                }
@@ -959,7 +959,7 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx,
                        sizeof(de.geoip_elem.as_string));
        } else if (strcasecmp(stype, "continent") == 0) {
                cfg_obj_log(obj, lctx, ISC_LOG_ERROR,
-                           "geoiop continent code (%s) too long", search);
+                           "geoip continent code (%s) too long", search);
                return (ISC_R_FAILURE);
        } else if (strcasecmp(stype, "isp") == 0) {
                subtype = dns_geoip_isp_name;