From 2f6ab604fc88cdd90a9435df2a9f324198a19d89 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 29 Sep 2012 15:08:44 +0200 Subject: [PATCH] Use static resolvers, if provided, in order to resolve names bypassing OpenDNS --- .../DNSCrypt/extra/usr/scripts/exceptions-add.sh | 3 +-- .../DNSCrypt/extra/usr/scripts/get-static-resolvers.sh | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/exceptions-add.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/exceptions-add.sh index 8ab1531..ebc54ce 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/exceptions-add.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/exceptions-add.sh @@ -39,8 +39,7 @@ remove_old_exceptions() { } } -name_servers=$(get_dhcp_dns || get_gw) - +name_servers=$(./get-static-resolvers.sh || get_dhcp_dns || get_gw) [ x"$name_servers" = 'x' ] && exit 0 default_domain=$(./get-current-default-domain.sh) diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-static-resolvers.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-static-resolvers.sh index 385720a..06bf6d6 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-static-resolvers.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-static-resolvers.sh @@ -2,4 +2,6 @@ . ./common.inc -[ -r "$STATIC_RESOLVERS_FILE" ] && cat "$STATIC_RESOLVERS_FILE" +[ -r "$STATIC_RESOLVERS_FILE" ] && cat "$STATIC_RESOLVERS_FILE" && exit 0 +exit 1 +