From 60de93e744fd308ba8f97fb37a7076ac1cacb678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 15 Oct 2020 20:49:18 +0200 Subject: [PATCH 1/6] tree-wide: update web link to logind description https://www.freedesktop.org/wiki/Software/systemd/multiseat/ says that it is obsoleted by sd-login(3), so it doesn't make much sense to link to the former. --- catalog/systemd.be.catalog.in | 8 ++++---- catalog/systemd.be@latin.catalog.in | 8 ++++---- catalog/systemd.bg.catalog.in | 8 ++++---- catalog/systemd.catalog.in | 8 ++++---- catalog/systemd.da.catalog.in | 8 ++++---- catalog/systemd.fr.catalog.in | 8 ++++---- catalog/systemd.hr.catalog.in | 8 ++++---- catalog/systemd.hu.catalog.in | 8 ++++---- catalog/systemd.it.catalog.in | 8 ++++---- catalog/systemd.ko.catalog.in | 8 ++++---- catalog/systemd.pl.catalog.in | 8 ++++---- catalog/systemd.pt_BR.catalog.in | 8 ++++---- catalog/systemd.ru.catalog.in | 8 ++++---- catalog/systemd.sr.catalog.in | 8 ++++---- catalog/systemd.zh_CN.catalog.in | 8 ++++---- catalog/systemd.zh_TW.catalog.in | 8 ++++---- docs/PORTABILITY_AND_STABILITY.md | 2 +- man/org.freedesktop.login1.xml | 3 +-- man/sd-login.xml | 3 +-- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- test/fuzz/fuzz-catalog/systemd.pl.catalog | 8 ++++---- units/systemd-logind.service.in | 2 +- 23 files changed, 90 insertions(+), 92 deletions(-) diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in index c5786c4012..f8816c7601 100644 --- a/catalog/systemd.be.catalog.in +++ b/catalog/systemd.be.catalog.in @@ -78,7 +78,7 @@ Documentation: man:core(5) Subject: Новая сесія № @SESSION_ID@ створана для карыстальніка @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Новая сесія з № @SESSION_ID@ створана для карыстальніка @USER_ID@. @@ -88,7 +88,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесія № @SESSION_ID@ спынена Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Сесія № @SESSION_ID@ спынена. @@ -96,7 +96,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Даступна новае працоўнае месца № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Новае працоўнае месца № @SEAT_ID@ наладжана і даступна для выкарыстання. @@ -104,7 +104,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Працоўнае месца № @SEAT_ID@ выдалена Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Працоўнае месца № @SEAT_ID@ выдалена і больш не даступна. diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in index bec5c6f048..ef9682c9b5 100644 --- a/catalog/systemd.be@latin.catalog.in +++ b/catalog/systemd.be@latin.catalog.in @@ -79,7 +79,7 @@ Rekamiendujecca paviedamić ab hetym raspracoŭnikam. Subject: Novaja siesija № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Novaja siesija z № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@. @@ -89,7 +89,7 @@ Lidar hetaj siesii pad № @LEADER@. Subject: Siesija № @SESSION_ID@ spyniena Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Siesija № @SESSION_ID@ spyniena. @@ -97,7 +97,7 @@ Siesija № @SESSION_ID@ spyniena. Subject: Dastupna novaje pracoŭnaje miesca № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Novaje pracoŭnaje miesca № @SEAT_ID@ naladžana i dastupna dlia vykarystannia. @@ -106,7 +106,7 @@ vykarystannia. Subject: Pracoŭnaje miesca № @SEAT_ID@ vydaliena Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Pracoŭnaje miesca № @SEAT_ID@ vydaliena i boĺš nie dastupna. diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in index 41f7b21bce..fcb245c154 100644 --- a/catalog/systemd.bg.catalog.in +++ b/catalog/systemd.bg.catalog.in @@ -81,7 +81,7 @@ Documentation: man:core(5) Subject: Създадена е нова сесия № @SESSION_ID@ за потребителя „@USER_ID@“ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) За потребителя „@USER_ID@“ е създадена нова сесия № @SESSION_ID@. @@ -91,7 +91,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесия № @SESSION_ID@ приключи Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Сесия № @SESSION_ID@ приключи работа. @@ -99,7 +99,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Налично е ново работно място № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Новото работно място № @SEAT_ID@ е настроено и готово за работа. @@ -107,7 +107,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Работното място № @SEAT_ID@ е премахнато Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Работното място № @SEAT_ID@ вече не е налично. diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index 056df00de8..3ad20e04ce 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -89,7 +89,7 @@ about the file being truncated. Subject: A new session @SESSION_ID@ has been created for user @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A new session with the ID @SESSION_ID@ has been created for the user @USER_ID@. @@ -99,7 +99,7 @@ The leading process of the session is @LEADER@. Subject: Session @SESSION_ID@ has been terminated Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A session with the ID @SESSION_ID@ has been terminated. @@ -107,7 +107,7 @@ A session with the ID @SESSION_ID@ has been terminated. Subject: A new seat @SEAT_ID@ is now available Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A new seat @SEAT_ID@ has been configured and is now available. @@ -115,7 +115,7 @@ A new seat @SEAT_ID@ has been configured and is now available. Subject: Seat @SEAT_ID@ has now been removed Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A seat @SEAT_ID@ has been removed and is no longer available. diff --git a/catalog/systemd.da.catalog.in b/catalog/systemd.da.catalog.in index aecfafa05f..eed98fa18d 100644 --- a/catalog/systemd.da.catalog.in +++ b/catalog/systemd.da.catalog.in @@ -64,7 +64,7 @@ og burde blive reporteret som en bug til folkene bag Subject: En ny session @SESSION_ID@ er blevet lavet for bruger @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) En ny session med ID @SESSION_ID@ er blevet lavet for brugeren @USER_ID@. @@ -74,7 +74,7 @@ Den ledende process for sessionen er @LEADER@. Subject: Session @SESSION_ID@ er blevet lukket ned Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) En session med ID @SESSION_ID@ er blevet lukket ned. @@ -82,7 +82,7 @@ En session med ID @SESSION_ID@ er blevet lukket ned. Subject: En ny arbejdsstation $SEAT_ID@ er nu tilgængelig Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig. @@ -90,7 +90,7 @@ En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig. Subject: Arbejdsstation @SEAT_ID@ er nu blevet fjernet Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) En arbejdsstation @SEAT_ID@ er blevet fjernet og er ikke længere tilgængelig. diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in index 13edd083cb..c2319b8228 100644 --- a/catalog/systemd.fr.catalog.in +++ b/catalog/systemd.fr.catalog.in @@ -82,7 +82,7 @@ incriminé, et cela devrait être notifié à son concepteur comme un défaut (b Subject: Une nouvelle session @SESSION_ID@ a été créée pour l'utilisateur @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Une nouvelle session a été créée pour l'utilisateur @USER_ID@ avec l'identifiant (ID) @SESSION_ID@. @@ -93,7 +93,7 @@ Le processus maître de la session est @LEADER@. Subject: La session @SESSION_ID@ s'est terminée Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) La session d'identifiant (ID) @SESSION_ID@ s'est terminée. @@ -101,7 +101,7 @@ La session d'identifiant (ID) @SESSION_ID@ s'est terminée. Subject: Un nouveau poste (seat) @SEAT_ID@ est disponible Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Un nouveau poste (seat) @SEAT_ID@ a été configuré et est maintenant disponible. @@ -110,7 +110,7 @@ disponible. Subject: Le poste (seat) @SEAT_ID@ a été retiré Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Le poste (seat) @SEAT_ID@ a été retiré et n'est plus disponible. diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in index 40727abaf5..43d69623cd 100644 --- a/catalog/systemd.hr.catalog.in +++ b/catalog/systemd.hr.catalog.in @@ -78,7 +78,7 @@ trebalo bi se prijaviti razvijatelju kao greška. Subject: Nova sesija @SESSION_ID@ je stvorena za korisnika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Nova sesija sa ID @SESSION_ID@ je stvorena za korisnika @USER_ID@. @@ -88,7 +88,7 @@ Glavni proces sesije je @LEADER@. Subject: Sesija @SESSION_ID@ je prekinuta Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Sesija sa ID @SESSION_ID@ je prekinuta. @@ -96,7 +96,7 @@ Sesija sa ID @SESSION_ID@ je prekinuta. Subject: Novo sjedište @SEAT_ID@ je sada dostupno Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Novo sjedište @SEAT_ID@ je podešeno i sada je dostupno. @@ -104,7 +104,7 @@ Novo sjedište @SEAT_ID@ je podešeno i sada je dostupno. Subject: Sjedište @SEAT_ID@ je sada uklonjeno Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Sjedište @SEAT_ID@ je uklonjeno i više nije dostupno. diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in index 5565b80b2a..ea60af20b2 100644 --- a/catalog/systemd.hu.catalog.in +++ b/catalog/systemd.hu.catalog.in @@ -64,7 +64,7 @@ a szállítója felé kell bejelenteni. Subject: Új munkamenet (@SESSION_ID@) létrehozva, felhasználója: @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Létrejött egy új munkamenet @SESSION_ID@ azonosítóval ezen felhasználóhoz: @USER_ID@. @@ -75,7 +75,7 @@ A munkamenet vezető folyamata: @LEADER@. Subject: Munkamenet (@SESSION_ID@) befejezve Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A következő azonosítójú munkamenet befejeződött: @SESSION_ID@. @@ -83,7 +83,7 @@ A következő azonosítójú munkamenet befejeződött: @SESSION_ID@. Subject: Elérhető egy új munkaállomás: @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Beállításra kerül és használható egy új munkaállomás: @SEAT_ID@. @@ -91,7 +91,7 @@ Beállításra kerül és használható egy új munkaállomás: @SEAT_ID@. Subject: A munkaállomás eltávolítva: @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) A munkaállomás el lett távolítva, és már nem érhető el: @SEAT_ID@ diff --git a/catalog/systemd.it.catalog.in b/catalog/systemd.it.catalog.in index c1375cca3e..c7ef447e5a 100644 --- a/catalog/systemd.it.catalog.in +++ b/catalog/systemd.it.catalog.in @@ -97,7 +97,7 @@ segnalare la troncatura. Subject: La nuova sessione @SESSION_ID@ è stata creata per l'utente @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Una nuova sessione con ID @SESSION_ID@ è stata creata per l'utente @USER_ID@. @@ -108,7 +108,7 @@ Il processo primario della sessione è @LEADER@. Subject: La sessione @SESSION_ID@ è terminata Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) La sessione con ID @SESSION_ID@ è terminata. @@ -117,7 +117,7 @@ La sessione con ID @SESSION_ID@ è terminata. Subject: La nuova postazione @SEAT_ID@ è ora disponibile Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile. @@ -126,7 +126,7 @@ La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile. Subject: La postazione @SEAT_ID@ è stata rimossa Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) La postazione @SEAT_ID@ è stata rimossa e non è più disponibile. diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in index 59fbde8b62..73d414d92d 100644 --- a/catalog/systemd.ko.catalog.in +++ b/catalog/systemd.ko.catalog.in @@ -86,7 +86,7 @@ Documentation: man:core(5) Subject: @USER_ID@ 사용자의 새 @SESSION_ID@ 세션 만듦 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) @USER_ID@ 사용자의 새 @SESSION_ID@ 세션을 만들었습니다. @@ -96,7 +96,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: @SESSION_ID@ 세션 마침 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) @SESSION_ID@ 세션을 끝냈습니다. @@ -104,7 +104,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 새 @SEAT_ID@ 시트 사용할 수 있음 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 새 @SEAT_ID@ 시트를 설정했고 사용할 수 있습니다. @@ -112,7 +112,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: @SEAT_ID@ 시트 제거함 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) @SEAT_ID@ 시트를 제거했으며 더이상 사용할 수 없습니다. diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in index f82bab8fc3..9881a6c6d1 100644 --- a/catalog/systemd.pl.catalog.in +++ b/catalog/systemd.pl.catalog.in @@ -92,7 +92,7 @@ gdb(1) będą ostrzegały o skróceniu pliku. Subject: Utworzono nową sesję @SESSION_ID@ dla użytkownika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Nowa sesja o identyfikatorze @SESSION_ID@ została utworzona dla użytkownika @USER_ID@. @@ -103,7 +103,7 @@ Proces prowadzący sesji: @LEADER@. Subject: Zakończono sesję @SESSION_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Sesja o identyfikatorze @SESSION_ID@ została zakończona. @@ -111,7 +111,7 @@ Sesja o identyfikatorze @SESSION_ID@ została zakończona. Subject: Dostępne jest nowe stanowisko @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. @@ -119,7 +119,7 @@ Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. Subject: Usunięto stanowisko @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Stanowisko @SEAT_ID@ zostało usunięte i nie jest już dostępne. diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in index edaefb7164..c07171674d 100644 --- a/catalog/systemd.pt_BR.catalog.in +++ b/catalog/systemd.pt_BR.catalog.in @@ -65,7 +65,7 @@ deveria ser relatado para seu fabricante como um erro. Subject: A nova sessão @SESSION_ID@ foi criada para usuário o @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Uma nova sessão com o ID @SESSION_ID@ foi criada para o usuário @USER_ID@. @@ -75,7 +75,7 @@ O processo originador da sessão é @LEADER@. Subject: Sessão @SESSION_ID@ foi terminada Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Um sessão com o ID @SESSION_ID@ foi terminada. @@ -83,7 +83,7 @@ Um sessão com o ID @SESSION_ID@ foi terminada. Subject: Um novo seat @SEAT_ID@ está disponível Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Um novo seat @SEAT_ID@ foi configurado e está disponível. @@ -91,7 +91,7 @@ Um novo seat @SEAT_ID@ foi configurado e está disponível. Subject: Seat @SEAT_ID@ foi removido agora Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Um seat @SEAT_ID@ foi removido e não está mais disponível. diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in index ccdc685037..9f100551dc 100644 --- a/catalog/systemd.ru.catalog.in +++ b/catalog/systemd.ru.catalog.in @@ -105,7 +105,7 @@ Documentation: man:coredump.conf(5) Subject: Для пользователя @USER_ID@ создан новый сеанс @SESSION_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Для пользователя @USER_ID@ создан новый сеанс с идентификатором @SESSION_ID@. @@ -116,7 +116,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сеанс @SESSION_ID@ завершен Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Сеанс с идентификатором @SESSION_ID@ завершился. @@ -125,7 +125,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Добавлено новое рабочее место @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Новое рабочее место (seat) @SEAT_ID@ полностью настроено и готово к использованию. @@ -135,7 +135,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Рабочее место @SEAT_ID@ отключено Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Рабочее место (seat) @SEAT_ID@ было отключено. diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in index 7cb6546d43..26c44b2a2b 100644 --- a/catalog/systemd.sr.catalog.in +++ b/catalog/systemd.sr.catalog.in @@ -63,7 +63,7 @@ Documentation: man:core(5) Subject: Нова сесија @SESSION_ID@ је направљена за корисника @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Нова сесија са ИБ-ом @SESSION_ID@ је направљена за корисника @USER_ID@. @@ -73,7 +73,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесија @SESSION_ID@ је окончана Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Сесија са ИБ-ом @SESSION_ID@ је окончана. @@ -81,7 +81,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Ново седиште @SEAT_ID@ је сада доступно Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Ново седиште @SEAT_ID@ је исподешавано и сада је доступно. @@ -89,7 +89,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Седиште @SEAT_ID@ је сада уклоњено Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Седиште @SEAT_ID@ је сада уклоњено и више није доступно. diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in index d6ac2592b8..5bae69911a 100644 --- a/catalog/systemd.zh_CN.catalog.in +++ b/catalog/systemd.zh_CN.catalog.in @@ -62,7 +62,7 @@ Documentation: man:core(5) Subject: 一个新会话 @SESSION_ID@ 已为用户 @USER_ID@ 建立 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一个 ID 为 @SESSION_ID@ 的新会话已为用户 @USER_ID@ 建立。 @@ -72,7 +72,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 会话 @SESSION_ID@ 已终止 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一个 ID 为 @SESSION_ID@ 的会话已终止。 @@ -80,7 +80,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 一个新的座位 @SEAT_ID@ 可用 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一个新的座位 @SEAT_ID@ 已被配置并已可用。 @@ -88,7 +88,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 座位 @SEAT_ID@ 已被移除 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 座位 @SEAT_ID@ 已被移除并不再可用。 diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in index a468c2f6bf..a6ddf2c133 100644 --- a/catalog/systemd.zh_TW.catalog.in +++ b/catalog/systemd.zh_TW.catalog.in @@ -65,7 +65,7 @@ Documentation: man:core(5) Subject: 新的工作階段 @SESSION_ID@ 已為使用者 @USER_ID@ 建立 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一個新的工作階段，ID @SESSION_ID@ 已為使用者 @USER_ID@ 建立。 @@ -75,7 +75,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 工作階段 @SESSION_ID@ 已結束 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一個工作階段，ID @SESSION_ID@ 已結束。 @@ -83,7 +83,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 新的座位 @SEAT_ID@ 可用 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 一個新的座位 @SEAT_ID@ 已被設定且現在可用。 @@ -91,7 +91,7 @@ Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 座位 @SEAT_ID@ 已被移除 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) 座位 @SEAT_ID@ 已被移除且不再可用。 diff --git a/docs/PORTABILITY_AND_STABILITY.md b/docs/PORTABILITY_AND_STABILITY.md index d15bfe117c..0caa5cc048 100644 --- a/docs/PORTABILITY_AND_STABILITY.md +++ b/docs/PORTABILITY_AND_STABILITY.md @@ -102,7 +102,7 @@ And now, here's the list of (hopefully) all APIs that we have introduced with sy | [Journal Export Format](https://www.freedesktop.org/wiki/Software/systemd/export) | File format | yes | yes | - | yes | - | no | | [Cooperation in cgroup tree](https://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups) | Treaty | yes | yes | libvirt | yes | libvirt | no | | [Password Agents](https://systemd.io/PASSWORD_AGENTS/) | Socket+Files | yes | yes | - | yes | - | no | -| [udev multi-seat properties](https://www.freedesktop.org/wiki/Software/systemd/multiseat) | udev Property | yes | yes | X11, gdm | no | - | no | +| [udev multi-seat properties](https://www.freedesktop.org/software/systemd/man/sd-login.html) | udev Property | yes | yes | X11, gdm | no | - | no | | udev session switch ACL properties | udev Property | no | no | - | no | - | no | | [CLI of systemctl,...](https://www.freedesktop.org/software/systemd/man/systemctl.html) | CLI | yes | yes | numerous | no | - | no | | [tmpfiles.d](https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html) | File format | yes | yes | numerous | yes | ArchLinux | partially | diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index 03f0107c72..17ffd493ab 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -509,8 +509,7 @@ node /org/freedesktop/login1 { and a boolean for controlling polkit interactivity (see below). Device assignments are persistently stored on disk. To create a new seat, simply specify a previously unused seat id. For more information about the seat assignment logic see - Multi-Seat for Linux. - + sd-login3. FlushDevices() removes all explicit seat assignments for devices, resetting all assignments to the automatic defaults. The only argument it takes is the polkit interactivity diff --git a/man/sd-login.xml b/man/sd-login.xml index 8c6c973a4d..f39be20fc5 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -241,8 +241,7 @@ Multi-Seat on Linux - for an introduction to multi-seat support on Linux and the background for this set of APIs. + may also be of historical interest. - diff --git a/po/da.po b/po/da.po index b3bf1b765e..1dafbc5a5c 100644 --- a/po/da.po +++ b/po/da.po @@ -86,7 +86,7 @@ msgstr "Der kræves godkendelse for at fjerne en brugers hjemmeområde." msgid "Check credentials of a home area" msgstr "Tjek loginoplysninger for et hjemmeområde" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:34 msgid "" "Authentication is required to check credentials against a user's home area." @@ -98,7 +98,7 @@ msgstr "" msgid "Update a home area" msgstr "Opdater et hjemmeområde" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:44 msgid "Authentication is required to update a user's home area." msgstr "Der kræves godkendelse for at opdatere en brugers hjemmeområde." @@ -116,7 +116,7 @@ msgstr "" msgid "Change password of a home area" msgstr "Skift adgangskode for et hjemmeområde" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:64 msgid "" "Authentication is required to change the password of a user's home area." @@ -315,22 +315,22 @@ msgstr "" "Der kræves godkendelse for at brugere, som ikke er logget ind, kan køre " "programmer." -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:137 msgid "Allow attaching devices to seats" msgstr "Tillad at montere af enheder til arbejdsstationer" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:138 msgid "Authentication is required to attach a device to a seat." msgstr "Der kræves godkendelse for at montere en enhed til en arbejdsstation." -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:148 msgid "Flush device to seat attachments" msgstr "Nulstil enhed monteret til en arbejdsstation" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:149 msgid "Authentication is required to reset how devices are attached to seats." msgstr "" @@ -502,7 +502,7 @@ msgstr "" msgid "Manage active sessions, users and seats" msgstr "Håndter aktive sessioner, brugere og arbejdsstationer" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:322 msgid "Authentication is required to manage active sessions, users and seats." msgstr "" @@ -802,7 +802,7 @@ msgstr "" msgid "Attach or detach a portable service image" msgstr "Tilslut eller frakobl et transportabel tjeneste-aftryk" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/portable/org.freedesktop.portable1.policy:24 msgid "" "Authentication is required to attach or detach a portable service image." diff --git a/po/de.po b/po/de.po index eac78e71fb..59a27d2634 100644 --- a/po/de.po +++ b/po/de.po @@ -94,7 +94,7 @@ msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig." msgid "Check credentials of a home area" msgstr "" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:34 #, fuzzy #| msgid "" @@ -109,7 +109,7 @@ msgstr "" msgid "Update a home area" msgstr "" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:44 #, fuzzy #| msgid "Authentication is required to attach a device to a seat." @@ -132,7 +132,7 @@ msgstr "Legitimierung ist zum Einstellen einer Nachricht an alle notwendig" msgid "Change password of a home area" msgstr "" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/home/org.freedesktop.home1.policy:64 #, fuzzy #| msgid "" @@ -364,24 +364,24 @@ msgstr "" "Legitimierung ist erforderlich, damit nicht angemeldete Benutzer Programme " "ausführen dürfen." -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:137 msgid "Allow attaching devices to seats" msgstr "Das Anschließen von Geräten an Arbeitsstationen erlauben" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:138 msgid "Authentication is required to attach a device to a seat." msgstr "" "Legitimierung ist zum Anschließen eines Geräts an eine Arbeitsstation " "notwendig." -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:148 msgid "Flush device to seat attachments" msgstr "Zurücksetzen der an eine Arbeitsstation angeschlossenen Geräte" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:149 msgid "Authentication is required to reset how devices are attached to seats." msgstr "" @@ -584,7 +584,7 @@ msgstr "" msgid "Manage active sessions, users and seats" msgstr "Aktive Sitzungen, Benutzer und Arbeitsstationen verwalten" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/login/org.freedesktop.login1.policy:322 msgid "Authentication is required to manage active sessions, users and seats." msgstr "" @@ -941,7 +941,7 @@ msgstr "" msgid "Attach or detach a portable service image" msgstr "" -# www.freedesktop.org/wiki/Software/systemd/multiseat/ +# https://www.freedesktop.org/software/systemd/man/sd-login.html #: src/portable/org.freedesktop.portable1.policy:24 #, fuzzy #| msgid "Authentication is required to attach a device to a seat." diff --git a/test/fuzz/fuzz-catalog/systemd.pl.catalog b/test/fuzz/fuzz-catalog/systemd.pl.catalog index 901541fd32..e0b582d4f2 100644 --- a/test/fuzz/fuzz-catalog/systemd.pl.catalog +++ b/test/fuzz/fuzz-catalog/systemd.pl.catalog @@ -92,7 +92,7 @@ gdb(1) będą ostrzegały o skróceniu pliku. Subject: Utworzono nową sesję @SESSION_ID@ dla użytkownika @USER_ID@ Defined-By: systemd Support: https://lists.freedesktop.org/mailman/listinfo/systemd-devel -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Nowa sesja o identyfikatorze @SESSION_ID@ została utworzona dla użytkownika @USER_ID@. @@ -103,7 +103,7 @@ Proces prowadzący sesji: @LEADER@. Subject: Zakończono sesję @SESSION_ID@ Defined-By: systemd Support: https://lists.freedesktop.org/mailman/listinfo/systemd-devel -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Sesja o identyfikatorze @SESSION_ID@ została zakończona. @@ -111,7 +111,7 @@ Sesja o identyfikatorze @SESSION_ID@ została zakończona. Subject: Dostępne jest nowe stanowisko @SEAT_ID@ Defined-By: systemd Support: https://lists.freedesktop.org/mailman/listinfo/systemd-devel -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. @@ -119,7 +119,7 @@ Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. Subject: Usunięto stanowisko @SEAT_ID@ Defined-By: systemd Support: https://lists.freedesktop.org/mailman/listinfo/systemd-devel -Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: sd-login(3) Stanowisko @SEAT_ID@ zostało usunięte i nie jest już dostępne. diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in index a00c858b6c..cb44ccbae6 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -9,10 +9,10 @@ [Unit] Description=User Login Management +Documentation=man:sd-login(3) Documentation=man:systemd-logind.service(8) Documentation=man:logind.conf(5) Documentation=man:org.freedesktop.login1(5) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/multiseat Wants=user.slice modprobe@drm.service After=nss-user-lookup.target user.slice modprobe@drm.service From 9e1804b24c2fc75cd049b967d0f6411b6b42fecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Oct 2020 16:51:14 +0200 Subject: [PATCH 2/6] man/systemd-resolved: reword the description of query a bit The phrase "routing domains" is used to mean both route-only domains and search domains. Route-only domains are always called like that, and not just "route domains". Some paragraphs are reordered to describe synthetisized records first, then LLMNR, then various ways quries are routed. Fixes #8928, hopefully. --- man/systemd-resolved.service.xml | 137 +++++++++++++++---------------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 6137a6d836..32512fd627 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -87,17 +87,17 @@ Synthetic Records - systemd-resolved synthesizes DNS resource records (RRs) for the following + systemd-resolved synthetizes DNS resource records (RRs) for the following cases: The local, configured hostname is resolved to all locally configured IP addresses ordered by their scope, or — if none are configured — the IPv4 address 127.0.0.2 (which is on the local - loopback) and the IPv6 address ::1 (which is the local host). + loopback interface) and the IPv6 address ::1 (which is the local host). The hostnames localhost and localhost.localdomain - (as well as any hostname ending in .localhost or - .localhost.localdomain) are resolved to the IP addresses 127.0.0.1 and ::1. + as well as any hostname ending in .localhost or + .localhost.localdomain are resolved to the IP addresses 127.0.0.1 and ::1. The hostname _gateway is resolved to all current default routing @@ -119,98 +119,97 @@ according to the following rules: - Names for which synthetic records are generated (as listed in the previous section) are - never routed to the network and a reply is sent immediately. In particular this means that lookups for - localhost are never routed to the network. + Names for which synthetic records are generated (the local hostname, + localhost and localdomain, local gateway, as listed in the + previous section) and addresses configured in /etc/hosts are never routed to the + network and a reply is sent immediately. - Single-label names are routed to all local interfaces capable of IP multicasting, where - LLMNR is not disabled, using the LLMNR protocol. Lookups for IPv4 addresses are only sent via LLMNR on - IPv4, and lookups for IPv6 addresses are only sent via LLMNR on IPv6. Lookups for the locally - configured hostname and the _gateway hostname are never routed to LLMNR. - + Single-label names are resolved using LLMNR on all local interfaces where LLMNR is + enabled. Lookups for IPv4 addresses are only sent via LLMNR on IPv4, and lookups for IPv6 addresses are + only sent via LLMNR on IPv6. Note that lookups for single-label synthetized names are not routed to + LLMNR, MulticastDNS or unicast DNS. - Multi-label names with the domain suffix .local are routed to all - local interfaces capable of IP multicasting, where MulticastDNS is not disabled, using the MulticastDNS - protocol. As with LLMNR, IPv4 address lookups are sent via IPv4 and IPv6 address lookups are sent via - IPv6. + Queries for the address records (A and AAAA) of single-label non-synthetized names are + resolved via unicast DNS using search domains. For any interface which defines search domains, such + look-ups are routed to that interface, suffixed with each of the search domains defined on that + interface in turn. When global search domains are defined, such look-ups are routed to all interfaces, + suffixed by each of the global search domains in turn. Additionally, lookup of single-label names via + unicast DNS may be enabled with the ResolveUnicastSingleLabel=yes setting. The + details of which servers are queried and how the final reply is chosen are described below. Note that + this means that address queries for single-label names are never sent out to remote DNS servers by + default, and resoulution is only possible if search domains are defined. - Resolution of address records (A and AAAA) via unicast DNS (i.e. not LLMNR or - MulticastDNS) for non-synthesized single-label names is allowed for non-top-level domains. This means - that such records can be resolved when search domains are defined. For any interface which defines - search domains, such look-ups are routed to that interface, suffixed with each of the search domains - defined on that interface in turn. When global search domains are defined, such look-ups are routed to - all interfaces, suffixed by each of the global search domains in turn. Additionally, lookup of - single-label names via unicast DNS may be enabled with the - ResolveUnicastSingleLabel=yes setting. The details of which servers are queried and - how the final reply is chosen are described below. Note that this means that address queries for - single-label names are never sent out to remote DNS servers by default, and if no search domains are - defined, resolution will fail. + Multi-label names with the domain suffix .local are resolved using + MulticastDNS on all local interfaces where MulticastDNS is enabled. As with LLMNR, IPv4 address lookups + are sent via IPv4 and IPv6 address lookups are sent via IPv6. - Other multi-label names are routed to all local interfaces that have a DNS server - configured, plus the globally configured DNS servers if there are any. Note that by default, lookups for - domains with the .local suffix are not routed to DNS servers, unless the domain is - specified explicitly as routing or search domain for the DNS server and interface. This means that on - networks where the .local domain is defined in a site-specific DNS server, explicit - search or routing domains need to be configured to make lookups within this DNS domain work. Note that - these days, it's generally recommended to avoid defining .local in a DNS server, as - RFC6762 reserves this domain for exclusive + Queries for multi-label names are routed via unicast DNS on local interfaces that have + a DNS server configured, plus the globally configured DNS servers if there are any. Which interfaces + are used is determined by the routing logic based on search and route-only domains, described below. + Note that by default, lookups for domains with the .local suffix are not routed to + DNS servers, unless the domain is specified explicitly as routing or search domain for the DNS server + and interface. This means that on networks where the .local domain is defined in a + site-specific DNS server, explicit search or routing domains need to be configured to make lookups work + within this DNS domain. Note that these days, it's generally recommended to avoid defining + .local in a DNS server, as RFC6762 reserves this domain for exclusive MulticastDNS use. - Address lookups are routed similarly to multi-label names, with the exception that - addresses from the link-local address range are never routed to unicast DNS and are only resolved using - LLMNR and MulticastDNS (when enabled). + Address lookups (reverse lookups) are routed similarly to multi-label names, with the + exception that addresses from the link-local address range are never routed to unicast DNS and are only + resolved using LLMNR and MulticastDNS (when enabled). If lookups are routed to multiple interfaces, the first successful response is returned (thus effectively merging the lookup zones on all matching interfaces). If the lookup failed on all interfaces, the last failing response is returned. - Routing of lookups may be influenced by configuring per-interface domain names and other - settings. See + Routing of lookups is determined by the per-interface routing domains (search and route-only) and + global search domains. See systemd.network5 and - resolvectl1 for - details. The following query routing logic applies for unicast DNS traffic: + resolvectl1 for a + description how those settings are set dynamically and the discussion of Domains= in + resolved.conf5 for a + description of globally configured DNS settings. + + The following query routing logic applies for unicast DNS traffic: If a name to look up matches (that is: is equal to or has as suffix) any of the - configured search or route-only domains of any link (see - systemd.network5), - or the globally configured DNS settings (see the discussion of Domains= in - resolved.conf5), - "best matching" search/route-only domain is determined: the matching one with the most labels. The - query is then sent to all DNS servers of any links or the globally configured DNS servers associated - with this "best matching" search/route-only domain. (Note that more than one link might have this same - "best matching" search/route-only domain configured, in which case the query is sent to all of them in - parallel). + configured routing domains (search or route-only) of any link, or the globally configured DNS settings, + "best matching" routing domain is determined: the matching one with the most labels. The query is then + sent to all DNS servers of any links or the globally configured DNS servers associated with this "best + matching" routing domain. (Note that more than one link might have this same "best matching" routing + domain configured, in which case the query is sent to all of them in parallel). In case of single-label names, when search domains are defined, the same logic applies, except - that the name is first suffixed by the search domain. + that the name is first suffixed by each of the search domains in turn. - If a query does not match any configured search/route-only domain (neither per-link nor - global), it is sent to all DNS servers that are configured on links with the "DNS default route" option - set, as well as the globally configured DNS server. + If a query does not match any configured routing domain (either per-link or global), it + is sent to all DNS servers that are configured on links with the DefaultRoute= + option set, as well as the globally configured DNS server. - If there is no link configured as "DNS default route" and no global DNS server - configured, the compiled-in fallback DNS server is used. + If there is no link configured as DefaultRoute= and no global DNS + server configured, one of the compiled-in fallback DNS servers is used. - Otherwise the query is failed as no suitable DNS servers could be determined. + Otherwise the unicast DNS query fails, as no suitable DNS servers can be determined. - The "DNS default route" option is a boolean setting configurable with resolvectl - or in .network files. If not set, it is implicitly determined based on the - configured DNS domains for a link: if there's any route-only domain (not matching ~.) - it defaults to false, otherwise to true. + The DefaultRoute= option is a boolean setting configurable with + resolvectl or in .network files. If not set, it is implicitly + determined based on the configured DNS domains for a link: if there's a route-only domain other than + ~., it defaults to false, otherwise to true. Effectively this means: in order to support single-label non-synthetized names, define appropriate - search domains. In order to preferably route all DNS queries not explicitly matched by search/route-only - domain configuration to a specific link, configure a ~. route-only domain on it. This - will ensure that other links will not be considered for these queries (unless they too carry such a - route-only domain). In order to route all such DNS queries to a specific link only if no other link - is preferable, set the "DNS default route" option for the link to true and do not configure a + search domains. In order to preferably route all DNS queries not explicitly matched by routing domain + configuration to a specific link, configure a ~. route-only domain on it. This will + ensure that other links will not be considered for these queries (unless they too carry such a routing + domain). In order to route all such DNS queries to a specific link only if no other link is preferred, + set the DefaultRoute= option for the link to true and do not configure a ~. route-only domain on it. Finally, in order to ensure that a specific link never - receives any DNS traffic not matching any of its configured search/route-only domains, set the "DNS - default route" option for it to false. + receives any DNS traffic not matching any of its configured routing domains, set the + DefaultRoute= option for it to false. See org.freedesktop.resolve15 From 2ce493672cb9a42ff0960ed127a850a8abfd12d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 21 Oct 2020 13:53:59 +0200 Subject: [PATCH 3/6] man/org.freedesktop.resolve1: briefly document a bunch of methods and properties Fixes #13799. --- man/org.freedesktop.resolve1.xml | 230 +++++++++++++++---------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index 6a6d9de6b9..b06155662a 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -156,12 +156,6 @@ node /org/freedesktop/resolve1 { }; - - - - - - @@ -170,28 +164,8 @@ node /org/freedesktop/resolve1 { - - - - - - - - - - - - - - - - - - - - @@ -281,26 +255,28 @@ node /org/freedesktop/resolve1 { Methods - ResolveHostname() takes a hostname and resolves it to one or more IP addresses. - As parameters it takes the Linux network interface index to execute the query on, or 0 if it may be - done on any suitable interface. The name parameter specifies the hostname to - resolve. Note that if required, IDNA conversion is applied to this name unless it is resolved via LLMNR or MulticastDNS. The family parameter - limits the results to a specific address family. It may be AF_INET, - AF_INET6 or AF_UNSPEC. If AF_UNSPEC is specified (recommended), both kinds are retrieved, subject - to local network configuration (i.e. if no local, routable IPv6 address is found, no IPv6 address is - retrieved; and similarly for IPv4). A 64-bit flags field may be used to alter the - behaviour of the resolver operation (see below). The method returns an array of address records. Each - address record consists of the interface index the address belongs to, an address family as well as a - byte array with the actual IP address data (which either has 4 or 16 elements, depending on the address - family). The returned address family will be one of AF_INET or - AF_INET6. For IPv6, the returned address interface index should be used to - initialize the .sin6_scope_id field of a struct sockaddr_in6 instance to permit - support for resolution to link-local IP addresses. The address array is followed by the canonical name - of the host, which may or may not be identical to the resolved hostname. Finally, a 64-bit - flags field is returned that is defined similarly to the flags - field that was passed in, but contains information about the resolved data (see below). If the hostname - passed in is an IPv4 or IPv6 address formatted as string, it is parsed, and the result is returned. In - this case, no network communication is done. + ResolveHostname() takes a hostname and resolves it to one or more IP + addresses. As parameters it takes the Linux network interface index to execute the query on, or 0 if + it may be done on any suitable interface. The name parameter specifies the hostname + to resolve. Note that if required, IDNA conversion is applied to this name unless it is resolved via + LLMNR or MulticastDNS. The family parameter limits the results to a specific address + family. It may be AF_INET, AF_INET6 or + AF_UNSPEC. If AF_UNSPEC is specified (recommended), both + kinds are retrieved, subject to local network configuration (i.e. if no local, routable IPv6 address is + found, no IPv6 address is retrieved; and similarly for IPv4). A 64-bit flags field + may be used to alter the behaviour of the resolver operation (see below). The method returns an array + of address records. Each address record consists of the interface index the address belongs to, an + address family as well as a byte array with the actual IP address data (which either has 4 or 16 + elements, depending on the address family). The returned address family will be one of + AF_INET or AF_INET6. For IPv6, the returned address interface + index should be used to initialize the .sin6_scope_id field of a + struct sockaddr_in6 instance to permit support for resolution to link-local IP + addresses. The address array is followed by the canonical name of the host, which may or may not be + identical to the resolved hostname. Finally, a 64-bit flags field is returned that + is defined similarly to the flags field that was passed in, but contains information + about the resolved data (see below). If the hostname passed in is an IPv4 or IPv6 address formatted as + string, it is parsed, and the result is returned. In this case, no network communication is + done. ResolveAddress() executes the reverse operation: it takes an IP address and acquires one or more hostnames for it. As parameters it takes the interface index to execute the query @@ -387,15 +363,19 @@ node /org/freedesktop/resolve1 { AF_INET6), followed by a 4-byte or 16-byte array with the raw address data. This method is a one-step shortcut for retrieving the Link object for a network interface using GetLink() (see above) and then invoking the SetDNS() method - (see below) on it. + (see below) on it. + + SetLinkDNSEx() is similar to SetLinkDNS(), but allows + an IP port (instead of the default 53) and DNS name to be specified for each DNS server. The server + name is used for Server Name Indication (SNI), which is useful when DNS-over-TLS is + used. C.f. DNS= in + resolved.conf5. - Network management software integrating with systemd-resolved should - call this method (and the five below) after the interface appeared in the kernel (and thus after a - network interface index has been assigned), but before the network interfaces is activated - (IFF_UP set) so that all settings take effect during the full time the network - interface is up. It is safe to alter settings while the interface is up, however. Use - RevertLink() (described below) to reset all per-interface settings. + SetLinkDefaultRoute() specifies whether the link shall be used as the + default route for name queries. See the description of name routing in + systemd-resolved.service8 + for details. The SetLinkDomains() method sets the search and routing domains to use on a specific network interface for DNS look-ups. It takes a network interface index and an array of domains, @@ -432,8 +412,22 @@ node /org/freedesktop/resolve1 { Negative Trust Anchors (NTAs) for a specific network interface. It takes a network interface index and a list of domains as arguments. - The RevertLink() method may be used to revert all per-link settings done with - the six methods described above to the defaults again. + The SetLinkDNSOverTLS() method enables or disables DNS-over-TLS. + C.f. DNSOverTLS= in + systemd-resolved.service8 + for details. + + Network management software integrating with systemd-resolved should call + SetLinkDNS() or SetLinkDNSEx(), + SetLinkDefaultRoute(), SetLinkDomains() and others after the + interface appeared in the kernel (and thus after a network interface index has been assigned), but + before the network interfaces is activated (IFF_UP set) so that all settings take + effect during the full time the network interface is up. It is safe to alter settings while the + interface is up, however. Use RevertLink() (described below) to reset all + per-interface settings. + + The RevertLink() method may be used to revert all per-link settings + described above to the defaults. The Flags Parameter @@ -458,11 +452,11 @@ node /org/freedesktop/resolve1 { classic unicast DNS, LLMNR via IPv4/UDP and IPv6/UDP respectively, as well as MulticastDNS via IPv4/UDP and IPv6/UDP. If all of these five bits are off on input (which is strongly recommended) the look-up will be done via all suitable protocols for the specific look-up. Note that these flags - operate as filter only, but cannot force a look-up to be done via a protocol. Specifically, systemd-resolved - will only route look-ups within the .local TLD to MulticastDNS (plus some reverse look-up address - domains), and single-label names to LLMNR (plus some reverse address lookup domains). It will route - neither of these to Unicast DNS servers. Also, it will do LLMNR and Multicast DNS only on interfaces - suitable for multicast. + operate as filter only, but cannot force a look-up to be done via a protocol. Specifically, + systemd-resolved will only route look-ups within the .local TLD to MulticastDNS + (plus some reverse look-up address domains), and single-label names to LLMNR (plus some reverse + address lookup domains). It will route neither of these to Unicast DNS servers. Also, it will do + LLMNR and Multicast DNS only on interfaces suitable for multicast. On output, these five flags indicate which protocol was used to execute the operation, and hence where the data was found. @@ -498,34 +492,50 @@ node /org/freedesktop/resolve1 { the data is "rightfully" unauthenticated (which includes cases where the underlying protocol or server does not support authenticating data). - - + Properties + The LLMNR and MulticastDNS properties report whether LLMNR + and MulticastDNS are (globally) enabled. Each may be one of yes, + no, and resolve. See SetLinkLLMNR() + and SetLinkMulticastDNS() above. + LLMNRHostname contains the hostname currently exposed on the network via LLMNR. It usually follows the system hostname as may be queried via gethostname3, but may differ if a conflict is detected on the network. - DNS contains an array of all DNS servers currently used by - systemd-resolved. It contains similar information as the DNS server data written to - /run/systemd/resolve/resolv.conf. Each structure in the array consists of a numeric network interface - index, an address family, and a byte array containing the DNS server address (either 4 bytes in length - for IPv4 or 16 bytes in lengths for IPv6). The array contains DNS servers configured system-wide, - including those possibly read from a foreign /etc/resolv.conf or the - DNS= setting in /etc/systemd/resolved.conf, as well as - per-interface DNS server information either retrieved from + DNS and DNSEx contain arrays of all DNS servers currently + used by systemd-resolved. DNS contains information similar to + the DNS server data in /run/systemd/resolve/resolv.conf. Each structure in the + array consists of a numeric network interface index, an address family, and a byte array containing the + DNS server address (either 4 bytes in length for IPv4 or 16 bytes in lengths for IPv6). + DNSEx is similar, but additionally contains the IP port and server name (used for + Server Name Indication, SNI). Both arrays contain DNS servers configured system-wide, including those + possibly read from a foreign /etc/resolv.conf or the DNS= + setting in /etc/systemd/resolved.conf, as well as per-interface DNS server + information either retrieved from systemd-networkd8, - or configured by external software via SetLinkDNS() (see above). The network - interface index will be 0 for the system-wide configured services and non-zero for the per-link - servers. + or configured by external software via SetLinkDNS() or + SetLinkDNSEx() (see above). The network interface index will be 0 for the + system-wide configured services and non-zero for the per-link servers. - Similarly, the Domains property contains an array of all search and - routing domains currently used by systemd-resolved. Each entry consists of a network interface index (again, 0 - encodes system-wide entries), the actual domain name, and whether the entry is used only for routing - (true) or for both routing and searching (false). + FallbackDNS and FallbackDNSEx contain arrays of all DNS + servers configured as fallback servers, if any, using the same format as DNS and + DNSEx described above. See the description of FallbackDNS= in + resolved.conf5 for + the description of when those servers are used. + + CurrentDNSServer and CurrentDNSServerEx specify the server + that is currently used for query resolution, in the same format as a single entry in the + DNS and DNSEx arrays described above. + + Similarly, the Domains property contains an array of all search and routing + domains currently used by systemd-resolved. Each entry consists of a network + interface index (again, 0 encodes system-wide entries), the actual domain name, and whether the entry + is used only for routing (true) or for both routing and searching (false). The TransactionStatistics property contains information about the number of transactions systemd-resolved has processed. It contains a pair of unsigned 64-bit counters, the first @@ -540,7 +550,14 @@ node /org/freedesktop/resolve1 { operations so far. It exposes three 64-bit counters: the first being the total number of current cache entries (both positive and negative), the second the number of cache hits, and the third the number of cache misses. The latter counters may be reset using ResetStatistics() (see - above). + above). + + The DNSSEC property specifies current status of DNSSEC validation. It is one + of yes (validation is enforced), no (no validation is done), + allow-downgrade (validation is done if the current DNS server supports it). See the + description of DNSSEC= in + resolved.conf5. + The DNSSECStatistics property contains information about the DNSSEC validations executed so far. It contains four 64-bit counters: the number of secure, insecure, bogus, @@ -559,12 +576,20 @@ node /org/freedesktop/resolve1 { DNSSEC is supported by DNS servers until it verifies that this is not the case. Thus, the reported value may initially be true, until the first transactions are executed. + The DNSOverTLS boolean property reports whether DNS-over-TLS is enabled. + + The ResolvConfMode property exposes how /etc/resolv.conf is managed on the host. Currently, the values uplink, stub, static (these three correspond to the three different files systemd-resolved.service provides), foreign (the file is managed by admin or another service, systemd-resolved.service just consumes it), missing (/etc/resolv.conf is missing). + + The DNSStubListener property reports whether the stub listener on port 53 is + enabled. Possible values are yes (enabled), no (disabled), + udp (only the UDP listener is enabled), and tcp (only the TCP + listener is enabled). @@ -619,40 +644,6 @@ node /org/freedesktop/resolve1/link/_1 { }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -721,8 +712,13 @@ node /org/freedesktop/resolve1/link/_1 { SetLinkDNS() on the Manager object, the main difference being that the later expects an interface index to be specified. Invoking the methods on the Manager interface has the benefit of reducing roundtrips, as it is not necessary to first request the Link object path via - GetLink() before invoking the methods. For further details on these methods see - the Manager documentation above. + GetLink() before invoking the methods. The same relationship holds for + SetDNSEx(), SetDomains(), + SetDefaultRoute(), SetLLMNR(), + SetMulticastDNS(), SetDNSOverTLS(), + SetDNSSEC(), SetDNSSECNegativeTrustAnchors(), and + Revert(). For further details on these methods see the + Manager documentation above. @@ -744,8 +740,12 @@ node /org/freedesktop/resolve1/link/_1 { assumed available until it is detected that the configured server does not actually support it. Thus, this property may initially report that DNSSEC is supported on an interface. + DefaultRoute exposes a boolean field that indicates whether the interface will + be used as default route for name queries. See SetLinkDefaultRoute() above. + The other properties reflect the state of the various configuration settings for the link which - may be set with the various methods calls such as SetDNS() or SetLLMNR(). + may be set with the various methods calls such as SetDNS() or + SetLLMNR(). From bace688394ab32d182f0624133f5db8367259402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 21 Oct 2020 17:52:37 +0200 Subject: [PATCH 4/6] man: document differences between nss-resolve and nss-dns https://bugzilla.redhat.com/show_bug.cgi?id=1889012 https://serverfault.com/questions/626612/dns-just-started-resolving-my-server-prod-addresses-to-127-0-53-53 https://serverfault.com/questions/649352/what-are-the-security-implications-of-the-allow-dns-suffix-appending-to-unquali --- man/systemd-resolved.service.xml | 62 ++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 32512fd627..8f3494e36b 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -183,7 +183,9 @@ domain configured, in which case the query is sent to all of them in parallel). In case of single-label names, when search domains are defined, the same logic applies, except - that the name is first suffixed by each of the search domains in turn. + that the name is first suffixed by each of the search domains in turn. Note that this search logic + doesn't apply to any names with at least one dot. Also see the discussion about compatiblity with + the traditional glibc resolver below. If a query does not match any configured routing domain (either per-link or global), it is sent to all DNS servers that are configured on links with the DefaultRoute= @@ -216,6 +218,63 @@ for information about the D-Bus APIs systemd-resolved provides. + + Compatibility with the traditional glibc stub resolver + + This section provides a short summary of differences in the stub resolver implemented by + nss-resolve8 together + with systemd-resolved and the tranditional stub resolver implemented in + nss-dns8. + + + Some names are always resolved internally (see Synthetic Records above). Traditionally + they would be resolved by nss-files, and only if provided in + /etc/hosts. + + Single-label names are not resolved for A and AAAA records using unicast DNS (unless + overriden with ResolveUnicastSingleLabel=, see + resolved.conf5). + This is similar to the option being set in + resolv.conf5. + + + Search domains are not used for suffixing of multi-label names. + (Search domains are nevertheless used for lookup routing, for names that were + originally specified as single-label or multi-label.) Any name with at least one dot is always + interpreted as a FQDN. nss-dns would resolve names both as relative (using search + domains) and absolute FQDN names. Some names would be resolved as relative first, and after that query + has failed, as absolute, while other names would be resolved in opposite order. The + ndots option in /etc/resolv.conf was used to control how many + dots the name needs to have to be resolved as relative first. This stub resolver does not implement + this at all: multi-label names are only resolved as FQDNs. (There are currently more than 1500 + top-level domain names defined, and new ones are added regularly, often using "attractive" names that + are also likely to be used locally. Not looking up multi-label names in this fashion avoids fragility + in both directions: a valid global name could be obscured by a local name, and resolution of a relative + local name could suddenly break when a new top-level domain is created, or when a new subdomain of a + top-level domain in registered. Resolving any given name as either relative or absolute avoids this + ambiguity.) + + This resolver has a notion of the special .local domain used for + MulticastDNS, and will not route queries with that suffix to unicast DNS servers unless explicitly + configured, see above. Also, reverse lookups for link-local addresses are not sent to unicast DNS + servers. + + This resolver reads and caches /etc/hosts internally. (In other + words, nss-resolve replaces nss-files in addition to + nss-dns). Entries in /etc/hosts have highest priority. + + + This resolver also implements LLMNR and MulticastDNS in addition to the classic unicast + DNS protocol, and will resolve single-label names using LLMNR (when enabled) and names ending in + .local using MulticastDNS (when enabled). + + Environment variables $LOCALDOMAIN and + $RES_OPTIONS described in + resolv.conf5 are not + supported currently. + + + <filename>/etc/resolv.conf</filename> @@ -302,7 +361,6 @@ synchronous way. - From 9c0780af5da59fb1494553133187cc9baadc21b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 21 Oct 2020 22:42:40 +0200 Subject: [PATCH 5/6] resolved.conf: add empty DNSStubListenerExtra= --- src/resolve/resolved.conf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in index 514021792f..93279b3dff 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -25,5 +25,6 @@ #LLMNR=@DEFAULT_LLMNR_MODE@ #Cache=yes #DNSStubListener=yes +#DNSStubListenerExtra= #ReadEtcHosts=yes #ResolveUnicastSingleLabel=no From 31619e2f61b6d5101d8b081099c94854b261d829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 21 Oct 2020 22:59:19 +0200 Subject: [PATCH 6/6] resolved: add trailing newlines in generated file Fixup for b3ffa2b5f3aa68dc6ab15893d5eeba8906aa3a9e. --- src/resolve/resolved-resolv-conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c index 40f1f32f0a..ba8f18f82d 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -273,8 +273,8 @@ static int write_uplink_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSe } if (ordered_set_isempty(domains)) - fputs("search .", f); /* Make sure that if the local hostname is chosen as fqdn this does not - * imply a search domain */ + fputs("search .\n", f); /* Make sure that if the local hostname is chosen as fqdn this does not + * imply a search domain */ else write_resolv_conf_search(domains, f); @@ -302,8 +302,8 @@ static int write_stub_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet "options edns0 trust-ad\n", f); if (ordered_set_isempty(domains)) - fputs("search .", f); /* Make sure that if the local hostname is chosen as fqdn this does not - * imply a search domain */ + fputs("search .\n", f); /* Make sure that if the local hostname is chosen as fqdn this does not + * imply a search domain */ else write_resolv_conf_search(domains, f);