resolve: rename PrivateDNS to DNSOverTLS

PrivateDNS is not considered a good name for this option, so rename it to DNSOverTLS
This commit is contained in:
Iwan Timmer
2018-06-14 09:57:56 +02:00
committed by Lennart Poettering
parent d122ed1ba8
commit c9299be2f5
31 changed files with 137 additions and 137 deletions
+6 -6
View File
@@ -48,14 +48,14 @@ _resolvectl() {
[LINK]='revert dns domain nta'
[RESOLVE]='llmnr mdns'
[DNSSEC]='dnssec'
[PRIVATEDNS]='privatedns'
[DNSOVERTLS]='dnsovertls'
[STANDALONE]='statistics reset-statistics flush-caches reset-server-features'
)
local -A ARGS=(
[FAMILY]='tcp udp sctp'
[RESOLVE]='yes no resolve'
[DNSSEC]='yes no allow-downgrade'
[PRIVATEDNS]='no opportunistic'
[DNSOVERTLS]='no opportunistic'
)
local interfaces=$( __get_interfaces )
@@ -111,7 +111,7 @@ _resolvectl() {
comps=""
fi
elif __contains_word "$verb" ${VERBS[LINK]} ${VERBS[RESOLVE]} ${VERBS[DNSSEC]} ${VERBS[PRIVATEDNS]}; then
elif __contains_word "$verb" ${VERBS[LINK]} ${VERBS[RESOLVE]} ${VERBS[DNSSEC]} ${VERBS[DNSOVERTLS]}; then
for ((i++; i < COMP_CWORD; i++)); do
if __contains_word "${COMP_WORDS[i]}" $interfaces &&
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
@@ -155,10 +155,10 @@ _resolvectl() {
comps=''
fi
elif __contains_word "$verb" ${VERBS[PRIVATEDNS]}; then
elif __contains_word "$verb" ${VERBS[DNSOVERTLS]}; then
name=
for ((i++; i < COMP_CWORD; i++)); do
if __contains_word "${COMP_WORDS[i]}" ${ARGS[PRIVATEDNS]} &&
if __contains_word "${COMP_WORDS[i]}" ${ARGS[DNSOVERTLS]} &&
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
name=${COMP_WORDS[i]}
break;
@@ -166,7 +166,7 @@ _resolvectl() {
done
if [[ -z $name ]]; then
comps=${ARGS[PRIVATEDNS]}
comps=${ARGS[DNSOVERTLS]}
else
comps=''
fi
+1 -1
View File
@@ -65,7 +65,7 @@ _systemd-resolve() {
--set-dnssec)
comps="yes no allow-downgrade"
;;
--set-privatedns)
--set-dnsovertls)
comps="no opportunistic"
;;
esac