Просмотр исходного кода

Merge pull request #1040 from Lupul/1039_iplist_comments

Firewall ipset: Trim comments (;#) and empty lines from ip lists
Raphael Schneeberger 5 лет назад
Родитель
Сommit
b084e2fab0
1 измененных файлов с 1 добавлено и 0 удалено
  1. 1 0
      bin/v-add-firewall-ipset

+ 1 - 0
bin/v-add-firewall-ipset

@@ -116,6 +116,7 @@ if [ ! -f "${IPSET_PATH}/${IPSET_FILE}.iplist" ] || [ "$force" = "yes" ]; then
     fi
 
     # Cleanup ip list
+    sed -r -i -e 's/[;#].*$//' -e 's/[ \t]*$//' -e '/^$/d' "$iplist_tempfile"
     if [[ $ip_version == 'v4' ]]; then
         sed -i -r -n -e '/^((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])/p' "$iplist_tempfile"
     elif [[ $ip_version == 'v6' ]]; then