aiccu: Add check to verify that only supported protocols are given by the CLI.

diff --git a/functions.aiccu b/functions.aiccu
index a201ee19ca0d7009bb21f2fb8da33b99b012c32a..d29c538bbfa3e6603790d83a7b79fe6f36782ef4 100644 (file)
--- a/functions.aiccu
+++ b/functions.aiccu
@@ -19,6 +19,9 @@
 #                                                                             #
 ###############################################################################
 
+# Define protocols which are supported by aiccu.
+AICCU_SUPPORTED_PROTOCOLS="tic tsp l2tp"
+
 function aiccu_start() {
        local device=${1}
        assert isset device
@@ -95,7 +98,7 @@ function aiccu_write_config() {
        assert isset server
        assert isset protocol
        assert isset require_tls
-       assert isoneof protocol tic tsp l2tp
+       assert isoneof ${protocol} ${AICCU_SUPPORTED_PROTOCOLS}
 
        # Write configuration file header.
        config_header "aiccu configuration file for ${zone}" > ${file}

diff --git a/hooks/zones/aiccu b/hooks/zones/aiccu
index a40a17b8140a054e2bbb2c8fcfe93c97571afbff..c5fbdd0f5c9e74e93262670d8cc1aea8986744f0 100755 (executable)
--- a/hooks/zones/aiccu
+++ b/hooks/zones/aiccu
@@ -36,6 +36,13 @@ function _check() {
        assert isset SERVER
        assert isset PROTOCOL
        assert isset REQUIRE_TLS
+
+       # Check if a supported protocol has been given.
+       if ! list_match "${PROTOCOL}" ${AICCU_SUPPORTED_PROTOCOLS}; then
+               log ERROR "This protocol is not supported by aiccu: ${PROTOCOL}"
+               log ERROR "Valid protocols are: ${AICCU_SUPPORTED_PROTOCOLS}"
+               return ${EXIT_ERROR}
+       fi
 }
 
 function _parse_cmdline() {