diff --git a/convert_pubkey.pl b/convert_pubkey.pl index 6675fa0..0444758 100644 --- a/convert_pubkey.pl +++ b/convert_pubkey.pl @@ -73,20 +73,20 @@ if ($options{'help'}) { # check file parameter if ($options{'file'}) { $key_file = $options{'file'}; - unless (-f $key_file) { - die "ERROR: input file $key_file not found [$!]"; - } + unless (-f $key_file) { + die "ERROR: input file $key_file not found [$!]"; + } } else { - die "ERROR: missing value for --file parameter"; + die "ERROR: missing value for --file parameter"; } # check label parameter if ($options{'label'}) { $key_label = $options{'label'}; - if (not (defined ($key_label) or $key_label eq "")) { - die "ERROR: key label not defined"; - } + if (not (defined ($key_label) or $key_label eq "")) { + die "ERROR: key label not defined"; + } } else { - die "ERROR: missing value for --label parameter"; + die "ERROR: missing value for --label parameter"; } # ----------------------------------------------------------------------------- @@ -99,33 +99,33 @@ close (KEY_FILE); # determine type of key if (grep { /$key_algo/ } @key_file) { - $key_type = 1; + $key_type = 1; } else { - $key_type = 2; + $key_type = 2; } # process key SWITCH: { - $key_type == 1 && do { - # 1 line only!! - foreach (@key_file) { - chomp; - ($key_algo, $key_line) = split (/ /); - }; - last SWITCH; - }; - $key_type == 2 && do { - foreach (@key_file) { - chomp; - # skip BEGIN/END lines - next if (/^----/); - # skip Comment field - next if (/^Comment/); - $key_line .= $_; - } - last SWITCH; - }; -} + $key_type == 1 && do { + # 1 line only!! + foreach (@key_file) { + chomp; + ($key_algo, $key_line) = split (/ /); + }; + last SWITCH; + }; + $key_type == 2 && do { + foreach (@key_file) { + chomp; + # skip BEGIN/END lines + next if (/^----/); + # skip Comment field + next if (/^Comment/); + $key_line .= $_; + } + last SWITCH; + }; +} # mangle space in label $key_label =~ tr/ /_/s; @@ -152,7 +152,7 @@ convert_pubkey.pl - converts public keys for SSH controls format (SSH-RSA) =head1 SYNOPSIS update_ssh.pl -f|--file= -l|--label= - [-h|--help] + [-h|--help] [-V|--version] diff --git a/manage_ssh.sh b/manage_ssh.sh index 86f544d..abc1565 100644 --- a/manage_ssh.sh +++ b/manage_ssh.sh @@ -810,7 +810,7 @@ do log "child process ${PID} exited [OK]" fi done - # break loop if we no child PIDs left + # break loop if we have no child PIDs left (($# > 0)) || break sleep 1 # required to avoid race conditions done @@ -941,17 +941,17 @@ done # check for configuration files (local overrides local) if [[ -r "${SCRIPT_DIR}/${GLOBAL_CONFIG_FILE}" || -r "${SCRIPT_DIR}/${LOCAL_CONFIG_FILE}" ]] then - if [[ -r "${SCRIPT_DIR}/${GLOBAL_CONFIG_FILE}" ]] - then - . "${SCRIPT_DIR}/${GLOBAL_CONFIG_FILE}" - fi - if [[ -r "${SCRIPT_DIR}/${LOCAL_CONFIG_FILE}" ]] - then - . "${SCRIPT_DIR}/${LOCAL_CONFIG_FILE}" - fi + if [[ -r "${SCRIPT_DIR}/${GLOBAL_CONFIG_FILE}" ]] + then + . "${SCRIPT_DIR}/${GLOBAL_CONFIG_FILE}" + fi + if [[ -r "${SCRIPT_DIR}/${LOCAL_CONFIG_FILE}" ]] + then + . "${SCRIPT_DIR}/${LOCAL_CONFIG_FILE}" + fi else - print -u2 "ERROR: could not find global or local configuration file" -fi + print -u2 "ERROR: could not find global or local configuration file" +fi # startup checks check_params && check_config && check_setup && check_logging @@ -994,7 +994,7 @@ case ${ARG_ACTION} in # wait until all background processes are completed wait_for_children ${PIDS} || \ warn "$? background jobs (possibly) failed to complete correctly" - PIDS='' + PIDS='' # reset max updates in background COUNT=${MAX_BACKGROUND_PROCS} fi @@ -1036,7 +1036,7 @@ case ${ARG_ACTION} in warn "$? background jobs (possibly) failed to complete correctly" PIDS='' # reset max updates in background - COUNT=${MAX_BACKGROUND_PROCS} + COUNT=${MAX_BACKGROUND_PROCS} fi done # final wait for background processes to be finished completely diff --git a/update_ssh.conf b/update_ssh.conf index 62946f5..c47e7bf 100644 --- a/update_ssh.conf +++ b/update_ssh.conf @@ -20,4 +20,4 @@ blacklist_file=/etc/kudos/ssh_controls/keys.blacklisted #****************************************************************************** # End of FILE -#****************************************************************************** +#****************************************************************************** \ No newline at end of file diff --git a/update_ssh.pl b/update_ssh.pl index 70fae3f..fc92b3c 100644 --- a/update_ssh.pl +++ b/update_ssh.pl @@ -545,7 +545,7 @@ unless ($preview) { last SWITCH_RELEASE; }; } - } + } # use fall back in case we cannot determine the version if (not (defined ($linux_version)) or $linux_version eq "") { $selinux_context = 'etc_t'; @@ -554,10 +554,10 @@ unless ($preview) { $selinux_context = $selinux_contexts{$linux_version}; } if ($has_selinux) { - do_log ("INFO: runtime info: OS major version $linux_version, SELinux context $selinux_context on $hostname"); - } else { - do_log ("INFO: runtime info: OS major version $linux_version on $hostname"); - } + do_log ("INFO: runtime info: OS major version $linux_version, SELinux context $selinux_context on $hostname"); + } else { + do_log ("INFO: runtime info: OS major version $linux_version on $hostname"); + } last SWITCH_OS; }; }