Fixed LD_LIBRARY_PATH

Author: Anonym-tsk

etc/init.d/common

@@ -109,8 +109,13 @@ validate_config() {
   fi
 }
 
+ndmc_cli() {
+  local SYSTEM_LD_LIBRARY_PATH="/lib:/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+  LD_LIBRARY_PATH="$SYSTEM_LD_LIBRARY_PATH" /bin/ndmc -c "$@"
+}
+
 create_running_config() {
-  local MARK=$(/bin/ndmc -c show ip policy 2>&1 | grep -i "description = $POLICY_NAME:" -A 1 | grep 'mark:' | grep -o '[^ ]*$' | head -n 1)
+  local MARK=$(ndmc_cli show ip policy 2>&1 | grep -i "description = $POLICY_NAME:" -A 1 | grep 'mark:' | grep -o '[^ ]*$' | head -n 1)
   if [ -n "$MARK" ]; then
     POLICY_MARK="0x$MARK/0x0fffffff"
     if [ -n "$POLICY_EXCLUDE" ] && [ "$POLICY_EXCLUDE" -ne "0" ]; then

etc/init.d/entware-start

@@ -2,8 +2,6 @@
 # Entware startup script
 
 PATH=/opt/sbin:/opt/bin:/opt/usr/sbin:/opt/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin
-# Required for ndmc call from web interface and startup
-LD_LIBRARY_PATH=/lib:/usr/lib:/opt/lib:/opt/usr/lib
 
 NFQWS_BIN="/opt/usr/bin/nfqws"
 CONFFILE="/opt/etc/nfqws/nfqws.conf"