diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-04 21:16:30 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-10 18:24:55 +0100 |
| commit | 3c39409c63502debcdec547e8ba19eafb19fee70 (patch) | |
| tree | 28a8bf97427635fd8a41b064c9ea7838443313d5 | |
| parent | 4108930e4cd6433aabf836b130d124366f2b91bd (diff) | |
| download | NetworkManager-3c39409c63502debcdec547e8ba19eafb19fee70.tar.gz | |
dns: use nm_utils_file_is_immutable() util
| -rw-r--r-- | src/dns/nm-dns-manager.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index c990243ec7..3c58f681c5 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -33,8 +33,6 @@ #include <sys/wait.h> #include <unistd.h> -#include <linux/fs.h> - #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-dns-manager.h" @@ -1604,8 +1602,6 @@ static NMDnsManagerResolvConfManager _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager) { struct stat st; - int fd, flags; - bool immutable = FALSE; switch (rc_manager) { case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN: @@ -1639,13 +1635,9 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager) } } - fd = open (_PATH_RESCONF, O_RDONLY | O_CLOEXEC); - if (fd != -1) { - if (ioctl (fd, FS_IOC_GETFLAGS, &flags) != -1) - immutable = NM_FLAGS_HAS (flags, FS_IMMUTABLE_FL); - close (fd); - } - return immutable ? NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE : rc_manager; + if (nm_utils_file_is_immutable (_PATH_RESCONF) > 0) + return NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE; + return rc_manager; } } |