github/openNDS
1
1
Fork 0
mirror of https://github.com/openNDS/openNDS.git synced 2026-01-10 20:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix - prevent duplication of dhcp_option_force on restart

Browse Source 
Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2025-06-10 21:31:08 +01:00
parent b517075d79
commit 485baaff6c
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forward_authentication_service/libs/dnsconfig.sh
View File

@@ -41,6 +41,8 @@ ipset_to_nftset () {
}
delete_114s() {
cpidconfig=$(echo "get dhcp.$network_zone.dhcp_option_force" | uci batch 2>/dev/null)
dellist="del_list dhcp.$network_zone.dhcp_option_force="
if [ ! -z "$cpidconfig" ]; then
@@ -162,24 +164,15 @@ elif [ "$setconf" = "cpidconf" ]; then
network_zone=$(uci show network | grep "device='$gwif'" | awk -F "." '{printf "%s", $2}')
if [ ! -z "$network_zone" ]; then
cpidconfig=$(uci get dhcp.lan.dhcp_option_force 2>/dev/null)
dellist="del_list dhcp.$network_zone.dhcp_option_force='114,http://$gatewayfqdn'"
if [ -z "$gatewayfqdn" ]; then
delete_114s
printf "%s" "done"
exit 0
fi
delete_114s
addlist="add_list dhcp.$network_zone.dhcp_option_force='114,http://$gatewayfqdn'"
if [ -z "$cpidconfig" ]; then
echo $addlist | uci batch
elif [ "$cpidconfig" != "114,http://$gatewayfqdn" ]; then
delete_114s
echo $addlist | uci batch
fi
echo $addlist | uci batch
fi
fi