picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolved: tone down comment in /run/systemd/{stub-,}resolve.conf

Browse source 
There are legitimate reasons to access the file directly, as currently
discussed on fedora-devel. Hence tone things down from "must" to "should
typically not".

Also, let's use fputs() instead of fputs_unlocked() here,
fopen_temporary_label() turns off stdio locking anyway for the whole
FILE*, hence no need to do this manually each time.
This commit is contained in:
Lennart Poettering 2020-04-16 15:06:58 +02:00
parent b11b278097
commit ce416f425c
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/resolve/resolved-resolv-conf.c
View file

@ -283,9 +283,9 @@ static int write_uplink_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSe
"# This is a dynamic resolv.conf file for connecting local clients directly to\n" "# This is a dynamic resolv.conf file for connecting local clients directly to\n"
"# all known uplink DNS servers. This file lists all configured search domains.\n" "# all known uplink DNS servers. This file lists all configured search domains.\n"
"#\n" "#\n"
"# Third party programs must not access this file directly, but only through the\n" "# Third party programs should typically not access this file directly, but only\n"
"# symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a different way,\n" "# through the symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a\n"
"# replace this symlink by a static file or a different symlink.\n" "# different way, replace this symlink by a static file or a different symlink.\n"
"#\n" "#\n"
"# See man:systemd-resolved.service(8) for details about the supported modes of\n" "# See man:systemd-resolved.service(8) for details about the supported modes of\n"
"# operation for /etc/resolv.conf.\n" "# operation for /etc/resolv.conf.\n"
@ -308,24 +308,24 @@ static int write_uplink_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSe
} }
static int write_stub_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet *domains) { static int write_stub_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet *domains) {
fputs_unlocked("# This file is managed by man:systemd-resolved(8). Do not edit.\n" fputs("# This file is managed by man:systemd-resolved(8). Do not edit.\n"
"#\n" "#\n"
"# This is a dynamic resolv.conf file for connecting local clients to the\n" "# This is a dynamic resolv.conf file for connecting local clients to the\n"
"# internal DNS stub resolver of systemd-resolved. This file lists all\n" "# internal DNS stub resolver of systemd-resolved. This file lists all\n"
"# configured search domains.\n" "# configured search domains.\n"
"#\n" "#\n"
"# Run \"resolvectl status\" to see details about the uplink DNS servers\n" "# Run \"resolvectl status\" to see details about the uplink DNS servers\n"
"# currently in use.\n" "# currently in use.\n"
"#\n" "#\n"
"# Third party programs must not access this file directly, but only through the\n" "# Third party programs should typically not access this file directly, but only\n"
"# symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a different way,\n" "# through the symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a\n"
"# replace this symlink by a static file or a different symlink.\n" "# different way, replace this symlink by a static file or a different symlink.\n"
"#\n" "#\n"
"# See man:systemd-resolved.service(8) for details about the supported modes of\n" "# See man:systemd-resolved.service(8) for details about the supported modes of\n"
"# operation for /etc/resolv.conf.\n" "# operation for /etc/resolv.conf.\n"
"\n" "\n"
"nameserver 127.0.0.53\n" "nameserver 127.0.0.53\n"
"options edns0\n", f); "options edns0\n", f);
if (!ordered_set_isempty(domains)) if (!ordered_set_isempty(domains))
write_resolv_conf_search(domains, f); write_resolv_conf_search(domains, f);