diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c index 7e25ee37a4..f3d1c57406 100644 --- a/src/backends/NetworkManagerArch.c +++ b/src/backends/NetworkManagerArch.c @@ -43,16 +43,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Make glibc/nscd aware of any changes to the resolv.conf file by - * restarting nscd; check if the daemon was already running - do not - * start a new instance - */ - if (g_file_test("/var/run/daemons/nscd", G_FILE_TEST_EXISTS)) - nm_spawn_process ("/etc/rc.d/nscd restart"); -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index ed29dd3a07..f18a40e408 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -41,15 +41,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c index d02778969d..58cf00f72b 100644 --- a/src/backends/NetworkManagerExherbo.c +++ b/src/backends/NetworkManagerExherbo.c @@ -36,17 +36,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Make glibc/nscd aware of any changes to the resolv.conf file by - * restarting nscd. Only restart if already running. - */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c index 301751e907..b7a9774de7 100644 --- a/src/backends/NetworkManagerFrugalware.c +++ b/src/backends/NetworkManagerFrugalware.c @@ -31,11 +31,6 @@ void nm_backend_enable_loopback (void) fwnet_loup (); } -void nm_backend_update_dns (void) -{ - /* I'm not running nscd */ -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c index eae6f733d8..561b784363 100644 --- a/src/backends/NetworkManagerGeneric.c +++ b/src/backends/NetworkManagerGeneric.c @@ -102,17 +102,6 @@ out: rtnl_addr_put (addr); } -/* - * nm_generic_update_dns - * - * Make glibc/nscd aware of any changes to the resolv.conf file by - * restarting nscd. - * - */ -void nm_generic_update_dns (void) -{ -} - /* * nm_generic_ipv6_use_tempaddr * @@ -164,11 +153,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - nm_generic_update_dns (); -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h index 3d4017e45e..93cedd317a 100644 --- a/src/backends/NetworkManagerGeneric.h +++ b/src/backends/NetworkManagerGeneric.h @@ -27,7 +27,6 @@ #include "nm-backend.h" void nm_generic_enable_loopback (void); -void nm_generic_update_dns (void); int nm_generic_ipv6_use_tempaddr (void); #endif /* NM_GENERIC_H */ diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c index 7370645a44..351ac9aeee 100644 --- a/src/backends/NetworkManagerGentoo.c +++ b/src/backends/NetworkManagerGentoo.c @@ -64,17 +64,6 @@ void nm_backend_enable_loopback (void) g_free (comm); } -void nm_backend_update_dns (void) -{ - /* Make glibc/nscd aware of any changes to the resolv.conf file by - * restarting nscd. Only restart if already running. - */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerLFS.c b/src/backends/NetworkManagerLFS.c index 7df2031cf0..fb3b0894a9 100644 --- a/src/backends/NetworkManagerLFS.c +++ b/src/backends/NetworkManagerLFS.c @@ -38,12 +38,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - if (g_file_test("/var/run/nscd/nscd.pid", G_FILE_TEST_EXISTS)) - nm_spawn_process ("/usr/sbin/nscd -i hosts"); -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerLinexa.c b/src/backends/NetworkManagerLinexa.c index 34fed3bbbc..3f03ec930e 100644 --- a/src/backends/NetworkManagerLinexa.c +++ b/src/backends/NetworkManagerLinexa.c @@ -37,15 +37,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c index f059beb65e..679674fcdb 100644 --- a/src/backends/NetworkManagerMandriva.c +++ b/src/backends/NetworkManagerMandriva.c @@ -33,15 +33,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) { - nm_spawn_process ("/etc/init.d/nscd condrestart"); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c index 2d01d8577a..b692e80e7c 100644 --- a/src/backends/NetworkManagerPaldo.c +++ b/src/backends/NetworkManagerPaldo.c @@ -35,15 +35,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerPardus.c b/src/backends/NetworkManagerPardus.c index acfeaed385..92ecc49218 100644 --- a/src/backends/NetworkManagerPardus.c +++ b/src/backends/NetworkManagerPardus.c @@ -31,10 +31,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c index 843b03b20b..144c69a18a 100644 --- a/src/backends/NetworkManagerRedHat.c +++ b/src/backends/NetworkManagerRedHat.c @@ -31,19 +31,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) { - if (g_file_test ("/etc/init.d/nscd", G_FILE_TEST_EXISTS)) - nm_spawn_process ("/etc/init.d/nscd condrestart"); - else if (g_file_test ("/bin/systemctl", G_FILE_TEST_IS_EXECUTABLE)) - nm_spawn_process ("/bin/systemctl condrestart nscd.service"); - - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c index cdd2dfb077..3d311b49ae 100644 --- a/src/backends/NetworkManagerSlackware.c +++ b/src/backends/NetworkManagerSlackware.c @@ -31,10 +31,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index 1261853206..2141f4f16f 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -36,15 +36,6 @@ void nm_backend_enable_loopback (void) nm_generic_enable_loopback (); } -void nm_backend_update_dns (void) -{ - /* Invalidate the nscd host cache, if it exists, since we changed resolv.conf */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); - nm_spawn_process ("/usr/sbin/nscd -i hosts"); - } -} - int nm_backend_ipv6_use_tempaddr (void) { return nm_generic_ipv6_use_tempaddr (); diff --git a/src/backends/nm-backend.h b/src/backends/nm-backend.h index 17d1ff6490..8f4b03b87f 100644 --- a/src/backends/nm-backend.h +++ b/src/backends/nm-backend.h @@ -24,7 +24,6 @@ /* Random disto-specific stuff */ void nm_backend_enable_loopback (void); -void nm_backend_update_dns (void); int nm_backend_ipv6_use_tempaddr (void); #endif /* NM_BACKEND_H */ diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 8a57344304..026375d321 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -40,7 +40,6 @@ #include "nm-ip4-config.h" #include "nm-ip6-config.h" #include "nm-logging.h" -#include "backends/nm-backend.h" #include "NetworkManagerUtils.h" #include "nm-posix-signals.h" @@ -766,9 +765,6 @@ update_dns (NMDnsManager *self, if (success == FALSE) success = update_resolv_conf (domain, searches, nameservers, iface, error); - if (success) - nm_backend_update_dns (); - if (searches) g_strfreev (searches); if (nameservers)