fix shifting args

master
Mikhail Novosyolov 3 years ago
parent 1a0ebd95af
commit 39d6a15da9

@ -166,7 +166,6 @@ _mk_auditd_config(){
"--local_events" ) shift; "--local_events" ) shift;
_check_argument_is_boolean "$1" "local_events" || failed=1 _check_argument_is_boolean "$1" "local_events" || failed=1
local_events="$1" local_events="$1"
shift
;; ;;
# We recommend using default /var/log/audit/audit.log to avoid mess # We recommend using default /var/log/audit/audit.log to avoid mess
# with SELinux, log rotation (auditd rotates the log by itself by default # with SELinux, log rotation (auditd rotates the log by itself by default
@ -180,7 +179,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
log_file="$1" log_file="$1"
shift
else else
failed=1 failed=1
fi fi
@ -188,7 +186,6 @@ _mk_auditd_config(){
"--write_logs" ) shift; "--write_logs" ) shift;
_check_argument_is_boolean "$1" "write_logs" || failed=1 _check_argument_is_boolean "$1" "write_logs" || failed=1
write_logs="$1" write_logs="$1"
shift
;; ;;
"--log_format" ) shift; "--log_format" ) shift;
if ! { [ "$1" = "ENRICHED" ] || [ "$1" = "RAW" ] ;}; then if ! { [ "$1" = "ENRICHED" ] || [ "$1" = "RAW" ] ;}; then
@ -196,7 +193,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
log_format="$1" log_format="$1"
shift
;; ;;
"--log_group" ) shift; "--log_group" ) shift;
_check_argument_is_string "$1" "log_group" || failed=1 _check_argument_is_string "$1" "log_group" || failed=1
@ -205,12 +201,10 @@ _mk_auditd_config(){
# may be not yet estabilished, e.g. in a chroot when being run via Anaconda installer, # may be not yet estabilished, e.g. in a chroot when being run via Anaconda installer,
# so such a check does not make sense # so such a check does not make sense
log_group="$1" log_group="$1"
shift
;; ;;
"--priority_boost" ) shift; "--priority_boost" ) shift;
_check_argument_is_non_negative_number "$1" "priority_boost" || failed=1 _check_argument_is_non_negative_number "$1" "priority_boost" || failed=1
priority_boost="$1" priority_boost="$1"
shift
;; ;;
"--flush" ) shift; "--flush" ) shift;
_check_argument_is_string "$1" "flush" || failed=1 _check_argument_is_string "$1" "flush" || failed=1
@ -226,13 +220,11 @@ _mk_auditd_config(){
;; ;;
esac esac
flush="$1" flush="$1"
shift
;; ;;
"--freq" ) shift; "--freq" ) shift;
if [ "$flush" = "incremental_async" ]; then if [ "$flush" = "incremental_async" ]; then
_check_argument_is_non_negative_number "$1" "freq" || failed=1 _check_argument_is_non_negative_number "$1" "freq" || failed=1
freq="$1" freq="$1"
shift
else else
error $"Parameter %s makes sense only when %s" "freq" "flush=incremental_async" error $"Parameter %s makes sense only when %s" "freq" "flush=incremental_async"
failed=1 failed=1
@ -253,7 +245,6 @@ _mk_auditd_config(){
;; ;;
esac esac
max_log_fileaction="$1" max_log_fileaction="$1"
shift
else else
failed=1 failed=1
fi fi
@ -266,7 +257,6 @@ _mk_auditd_config(){
else else
_check_argument_is_non_negative_number "$1" "num_logs" || failed=1 _check_argument_is_non_negative_number "$1" "num_logs" || failed=1
num_logs="$1" num_logs="$1"
shift
fi fi
;; ;;
"--disp_qos" ) shift; "--disp_qos" ) shift;
@ -281,7 +271,6 @@ _mk_auditd_config(){
;; ;;
esac esac
disp_qos="$1" disp_qos="$1"
shift
else else
failed=1 failed=1
fi fi
@ -294,7 +283,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
dispatcher="$1" dispatcher="$1"
shift
else else
failed=1 failed=1
fi fi
@ -308,7 +296,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
distribute_network="$1" distribute_network="$1"
shift
;; ;;
"--name_format" ) shift; "--name_format" ) shift;
if _check_argument_is_string "$1" "name_format" if _check_argument_is_string "$1" "name_format"
@ -325,7 +312,6 @@ _mk_auditd_config(){
;; ;;
esac esac
name_format="$1" name_format="$1"
shift
else else
failed=1 failed=1
fi fi
@ -337,18 +323,15 @@ _mk_auditd_config(){
failed=1 failed=1
else else
name="$1" name="$1"
shift
fi fi
;; ;;
"--max_log_file" ) shift; "--max_log_file" ) shift;
_check_argument_is_non_negative_number "$1" "max_log_file" || failed=1 _check_argument_is_non_negative_number "$1" "max_log_file" || failed=1
max_log_file="$1" max_log_file="$1"
shift
;; ;;
"--action_mail_acct" ) shift; "--action_mail_acct" ) shift;
_validate_email "$1" || failed=1 _validate_email "$1" || failed=1
action_mail_acct="$1" action_mail_acct="$1"
shift
;; ;;
"--space_left" ) shift; "--space_left" ) shift;
local tmp_space_left="$1" local tmp_space_left="$1"
@ -359,7 +342,6 @@ _mk_auditd_config(){
fi fi
_check_argument_is_non_negative_number "$space_left" "space_left" || failed=1 _check_argument_is_non_negative_number "$space_left" "space_left" || failed=1
space_left="$1" space_left="$1"
shift
unset tmp_space_left unset tmp_space_left
;; ;;
"--space_left_action" ) shift; "--space_left_action" ) shift;
@ -367,21 +349,18 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
space_left_action="$1" space_left_action="$1"
shift
;; ;;
"--disk_full_action" ) shift; "--disk_full_action" ) shift;
if ! _audit_action_config "$1" "disk_full_action" ; then if ! _audit_action_config "$1" "disk_full_action" ; then
failed=1 failed=1
fi fi
disk_full_action="$1" disk_full_action="$1"
shift
;; ;;
"--disk_error_action" ) shift; "--disk_error_action" ) shift;
if ! _audit_action_config "$1" "disk_error_action" ; then if ! _audit_action_config "$1" "disk_error_action" ; then
failed=1 failed=1
fi fi
disk_error_action="$1" disk_error_action="$1"
shift
;; ;;
# TODO: admin_space_left # TODO: admin_space_left
# TODO: admin_space_left_action # TODO: admin_space_left_action
@ -403,7 +382,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
tcp_listen_port="$1" tcp_listen_port="$1"
shift
;; ;;
"--tcp_max_per_addr" ) shift; "--tcp_max_per_addr" ) shift;
if _check_argument_is_non_negative_number "$1" "tcp_max_per_addr" if _check_argument_is_non_negative_number "$1" "tcp_max_per_addr"
@ -417,7 +395,6 @@ _mk_auditd_config(){
failed=1 failed=1
fi fi
tcp_max_per_addr="$1" tcp_max_per_addr="$1"
shift
;; ;;
# TODO: tcp_client_ports # TODO: tcp_client_ports
# TODO: tcp_client_max_idle # TODO: tcp_client_max_idle
@ -427,9 +404,9 @@ _mk_auditd_config(){
"--systemd-firewalling-params" ) shift; "--systemd-firewalling-params" ) shift;
_mk_systemd_auditd_override $* _mk_systemd_auditd_override $*
shift
;; ;;
esac esac
shift
done done
if [ "$failed" != 0 ]; then if [ "$failed" != 0 ]; then
error $"Errors occured when trying to understand how to configure auditd" error $"Errors occured when trying to understand how to configure auditd"

Loading…
Cancel
Save