OpenWrt
/
telephony
mirror of https://git.openwrt.org/feed/telephony.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #608 from guidosarducci/master-fix-uid-error 

siproxd: fix UID variable conflict in init
This commit is contained in:
micmac1 2021-01-25 22:28:59 +01:00 committed by GitHub
parent 4d2bb84647 442a19214b
commit da8e877450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/siproxd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=siproxd
PKG_VERSION:=0.8.3
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/siproxd

10
net/siproxd/files/siproxd.init
View File

@ -11,8 +11,8 @@ CONF_DIR="/var/etc/siproxd"
REG_DIR="/var/lib/siproxd"
PID_DIR="/var/run/siproxd"
PLUGIN_DIR="/usr/lib/siproxd/"
UID="nobody"
GID="nogroup"
SIPROXD_UID="nobody"
SIPROXD_GID="nogroup"
# Some options need special handling or conflict with procd/jail setup.
append CONF_SKIP "interface_inbound interface_outbound chrootjail"
@ -74,7 +74,7 @@ apply_defaults() {
default_conf tcp_keepalive 20
default_conf default_expires 600
default_conf daemonize 0
default_conf user "$UID"
default_conf user "$SIPROXD_UID"
default_conf registration_file "$REG_DIR/siproxd-$sec.reg"
default_conf plugindir "$PLUGIN_DIR"
}
@ -116,7 +116,7 @@ section_end() {
[ -d "$plugin_dir" ] && procd_add_jail_mount "$plugin_dir"
# Ensure registration file exists for jail
[ -f "$reg_file" ] || touch "$reg_file"
chown "$UID:$GID" "$reg_file"
chown "$SIPROXD_UID:$SIPROXD_GID" "$reg_file"
procd_add_jail_mount_rw "$reg_file"
procd_close_instance
}
@ -163,7 +163,7 @@ service_triggers()
start_service() {
mkdir -p "$CONF_DIR" "$REG_DIR" "$PID_DIR"
chmod 755 "$CONF_DIR" "$REG_DIR" "$PID_DIR"
chown "$UID:$GID" "$REG_DIR"
chown "$SIPROXD_UID:$SIPROXD_GID" "$REG_DIR"
siproxd_cb
config_load 'siproxd'