kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

safe_asterisk: Resolve a POSIX sh problem and restore globbing behavior.

Browse Source 
* Using `==` with the POSIX sh `test` utility is UB.
* Switch back to using globs instead of using `$(find … | sort)`.
* Fix a missing redirect when checking for the OS type.

Resolves: #1554
This commit is contained in:
Sean Bright
2025-10-22 10:53:46 -04:00
parent a0d7de40aa
commit 00ebdc0951
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/scripts/safe_asterisk Normal file → Executable file
View File

@@ -81,7 +81,7 @@ else
fi fi
fi fi
SYSCTL_MAXFILES="fs.file-max" SYSCTL_MAXFILES="fs.file-max"
elif `uname -s | grep Darwin /dev/null 2>&1`; then elif `uname -s | grep Darwin >/dev/null 2>&1`; then
SYSCTL_MAXFILES="kern.maxfiles" SYSCTL_MAXFILES="kern.maxfiles"
fi fi
@@ -162,7 +162,7 @@ trap '' PIPE
if test -d "${ASTETCDIR}/startup.d"; then if test -d "${ASTETCDIR}/startup.d"; then
# If this script is run by root, the startup.d directory and all scripts in it # If this script is run by root, the startup.d directory and all scripts in it
# must be owned by root. # must be owned by root.
if test `id -u` == 0; then if test `id -u` = 0; then
dir_owner=$(stat -c '%u' "${ASTETCDIR}/startup.d" 2>/dev/null) dir_owner=$(stat -c '%u' "${ASTETCDIR}/startup.d" 2>/dev/null)
if test "${dir_owner}" != 0 ; then if test "${dir_owner}" != 0 ; then
message "FATAL: ${ASTETCDIR}/startup.d is not owned by root" message "FATAL: ${ASTETCDIR}/startup.d is not owned by root"
@@ -170,7 +170,7 @@ if test -d "${ASTETCDIR}/startup.d"; then
fi fi
# Check all scripts for proper ownership before sourcing any of them. # Check all scripts for proper ownership before sourcing any of them.
for script in $(find "${ASTETCDIR}/startup.d/" -name '*.sh') ; do for script in "${ASTETCDIR}/startup.d/"*.sh ; do
if test -r "${script}"; then if test -r "${script}"; then
script_owner=$(stat -c '%u' "${script}" 2>/dev/null) script_owner=$(stat -c '%u' "${script}" 2>/dev/null)
if test "$script_owner" != 0 ; then if test "$script_owner" != 0 ; then
@@ -181,7 +181,7 @@ if test -d "${ASTETCDIR}/startup.d"; then
done done
fi fi
for script in $(find "${ASTETCDIR}/startup.d/" -name '*.sh' | sort) ; do for script in "${ASTETCDIR}/startup.d/"*.sh ; do
. "${script}" . "${script}"
done done
fi fi