From 92f3b86a55bd3e01fde2d93bc8123c6d1b70d0ed Mon Sep 17 00:00:00 2001 From: Piotrek Zadroga Date: Wed, 31 May 2023 15:43:55 +0200 Subject: [PATCH] [#2855] kea-admin lease-upload check added --- src/bin/admin/kea-admin.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in index e73cef199b..111b4c71ef 100644 --- a/src/bin/admin/kea-admin.in +++ b/src/bin/admin/kea-admin.in @@ -689,6 +689,13 @@ stringify_positions_in_line() { # Entry point for the lease-upload command. lease_upload() { + # Check the lease type was given + if [ ${dhcp_version} -eq 0 ]; then + log_error "lease-upload: lease type -4 or -6 needs to be specified" + usage + exit 1 + fi + # Check that an input file was specified. if test -z "${input_file-}"; then log_error 'you must specify an input file with -i or --input for lease-upload' @@ -720,12 +727,8 @@ lease_upload() { # to be further processed by a procedure. if test "${dhcp_version}" = '4'; then string_columns='address hwaddr client_id hostname user_context' - elif test "${dhcp_version}" = '6'; then - string_columns='address duid hostname hwaddr user_context' else - log_error "lease-upload: lease type -4 or -6 needs to be specified" - usage - exit 1 + string_columns='address duid hostname hwaddr user_context' fi # Get positions of string columns. -- 2.47.2