Allow old and new API response

CLOSES acmesh-official#2480
ThiloGa · Apr 28, 2020 · 348de0b · 348de0b
1 parent 8da0c2d
commit 348de0b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dnsapi/dns_opnsense.sh b/dnsapi/dns_opnsense.sh
@@ -150,7 +150,11 @@ _get_root() {
       return 1
     fi
     _debug h "$h"
+<<<<<<< HEAD
     id=$(echo "$_domain_response" | _egrep_o "\"[^\"]*\":{\"enabled\":\"1\",\"type\":{\"master\":{\"value\":\"master\",\"selected\":1},\"slave\":{\"value\":\"slave\",\"selected\":0}},\"masterip\":\"[^\"]*\",\"domainname\":\"${h}\"" | cut -d ':' -f 1 | cut -d '"' -f 2)
+=======
+    id=$(echo "$_domain_response" | _egrep_o "\"[^\"]*\":{\"enabled\":\"1\",\"type\":{\"master\":{\"value\":\"master\",\"selected\":1},\"slave\":{\"value\":\"slave\",\"selected\":0}},\"masterip\":\"[^\"]*\"(,\"allownotifyslave\":{\"\":{[^}]*}},|,)\"domainname\":\"${h}\"" | cut -d ':' -f 1 | cut -d '"' -f 2)
+>>>>>>> Allow old and new API response
 
     if [ -n "$id" ]; then
       _debug id "$id"