Skip to content

Make sure "logger" message arguments are not interpreted as command line switches #3492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2024
Merged

Make sure "logger" message arguments are not interpreted as command line switches #3492

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f01d70c
MDEV-34847 : Unquoted argument in {{logger}} call leads to invalid ar…
hholzgra Aug 30, 2024
06326e4
MDEV-34847 : Unquoted argument in {{logger}} call leads to invalid ar…
hholzgra Aug 30, 2024
2286c74
Merge branch '10.5' into hartmut-mdev-34847
grooverdan Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/wsrep_sst_mariabackup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ recv_joiner()
wsrep_log_error "receiving process ended without creating" \
"magic file ($MAGIC_FILE)"
wsrep_log_info "Contents of datadir:"
wsrep_log_info $(ls -l "$dir/"*)
wsrep_log_info "$(ls -l "$dir/"*)"
exit 32
fi

Expand Down Expand Up @@ -951,17 +951,17 @@ if [ $ssyslog -eq 1 ]; then

wsrep_log_error()
{
logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}

wsrep_log_warning()
{
logger -p daemon.warning -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.warning -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}

wsrep_log_info()
{
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE -- "$@"
}
else
wsrep_log_error "logger not in path: $PATH. Ignoring"
Expand Down Expand Up @@ -1365,7 +1365,7 @@ else # joiner
# Compact backups are not supported by mariadb-backup
if grep -qw -F 'compact = 1' "$DATA/xtrabackup_checkpoints"; then
wsrep_log_info "Index compaction detected"
wsrel_log_error "Compact backups are not supported by mariadb-backup"
wsrep_log_error "Compact backups are not supported by mariadb-backup"
exit 2
fi

Expand Down