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

Fix: inconsistency when searching for dns records

in some cases the whole record line was present in $dkim_records, when only records id's were expected

Error Message:
Error: invalid id format :: _domainkey
Error: invalid id format :: TXT
Error: invalid id format :: "t=y;
Error: invalid id format :: mail._domainkey
Error: invalid id format :: TXT
Error: invalid id format :: "v=DKIM1;
Robert Zollner 5 лет назад
Родитель
Сommit
7e1bcd9603
1 измененных файлов с 1 добавлено и 2 удалено
  1. 1 2
      bin/v-delete-mail-domain

+ 1 - 2
bin/v-delete-mail-domain

@@ -58,8 +58,7 @@ fi
 
 # Deleting dkim dns record
 if [ "$DKIM" = 'yes' ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
-    records=$($BIN/v-list-dns-records $user $domain plain)
-    dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ')
+    dkim_records=$($BIN/v-list-dns-records $user $domain plain | awk '{print $1,$2}' | grep -w '_domainkey' | cut -f 1 -d ' ')
     for id in $dkim_records; do
         $BIN/v-delete-dns-record $user $domain $id
     done