Browse Source

Merge pull request #16318 from selanf/x2

xinetd: support for anonym configs
lilik-openwrt-22.03
Florian Eckert 3 years ago
committed by GitHub
parent
commit
4608a73bf0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      net/xinetd/Makefile
  2. +3
    -3
      net/xinetd/files/xinetd.init

+ 1
- 1
net/xinetd/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xinetd PKG_NAME:=xinetd
PKG_VERSION:=2.3.15 PKG_VERSION:=2.3.15
PKG_RELEASE:=11
PKG_RELEASE:=12
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive


+ 3
- 3
net/xinetd/files/xinetd.init View File

@ -43,7 +43,7 @@ config_cb() {
fi fi
local type="$1" local type="$1"
local name="$2"
local name="$(uci -q get xinetd.$2.name || echo $2)"
if [ "$type" = "service" ]; then if [ "$type" = "service" ]; then
@ -62,7 +62,7 @@ config_cb() {
local option="$1" local option="$1"
local value="$2" local value="$2"
[ -n "$value" ] && echo -e "\t$option = $value" >> $GENERATED_CONF_FILE
[ -n "$value" ] && [ "$option" != "name" ] && echo -e "\t$option = $value" >> $GENERATED_CONF_FILE
} }
# redefined callback for lists when calling config_load # redefined callback for lists when calling config_load
@ -71,7 +71,7 @@ config_cb() {
local value="$2" local value="$2"
# write out last list option if new list starts # write out last list option if new list starts
if [ "$ListName" != "" -a "$ListName" != "$name" ]; then
if [ -n "$ListName" ] && [ "$ListName" != "$name" ]; then
echo -e "\t$ListName = $ListVals" >> $GENERATED_CONF_FILE echo -e "\t$ListName = $ListVals" >> $GENERATED_CONF_FILE


Loading…
Cancel
Save