Browse Source
Merge pull request #4294 from koelle25/dev
Fix OPNsense DNS plugin (again)
pull/4297/head
neil
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
dnsapi/dns_opnsense.sh
|
|
@ -137,7 +137,7 @@ _get_root() { |
|
|
domain=$1 |
|
|
domain=$1 |
|
|
i=2 |
|
|
i=2 |
|
|
p=1 |
|
|
p=1 |
|
|
if _opns_rest "GET" "/domain/searchDomain"; then |
|
|
|
|
|
|
|
|
if _opns_rest "GET" "/domain/searchMasterDomain"; then |
|
|
_domain_response="$response" |
|
|
_domain_response="$response" |
|
|
else |
|
|
else |
|
|
return 1 |
|
|
return 1 |
|
|
@ -150,7 +150,7 @@ _get_root() { |
|
|
return 1 |
|
|
return 1 |
|
|
fi |
|
|
fi |
|
|
_debug h "$h" |
|
|
_debug h "$h" |
|
|
id=$(echo "$_domain_response" | _egrep_o "\"uuid\":\"[a-z0-9\-]*\",\"enabled\":\"1\",\"type\":\"master\",[^.]*,\"domainname\":\"${h}\"" | cut -d ':' -f 2 | cut -d '"' -f 2) |
|
|
|
|
|
|
|
|
id=$(echo "$_domain_response" | _egrep_o "\"uuid\":\"[a-z0-9\-]*\",\"enabled\":\"1\",\"type\":\"master\",\"domainname\":\"${h}\"" | cut -d ':' -f 2 | cut -d '"' -f 2) |
|
|
if [ -n "$id" ]; then |
|
|
if [ -n "$id" ]; then |
|
|
_debug id "$id" |
|
|
_debug id "$id" |
|
|
_host=$(printf "%s" "$domain" | cut -d . -f 1-$p) |
|
|
_host=$(printf "%s" "$domain" | cut -d . -f 1-$p) |
|
|
|
