From 3b3af295760329f8f9b4a81566ecbb4bd93b906b Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 3 May 2006 19:29:15 +0000 Subject: [PATCH] 2006-05-03 Robert Love * src/backends/NetworkManagerSuSE.c: Respect the variable dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether or not to dynamically update /etc/resolv.conf. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1716 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/backends/NetworkManagerSuSE.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dda32b0e1..18cfb53c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-03 Robert Love + + * src/backends/NetworkManagerSuSE.c: Respect the variable + dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not + config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether or not + to dynamically update /etc/resolv.conf. + 2006-05-02 Peter Jones * vpn-daemons/vpnc/src/nm-vpnc-service.c: Allow rekeying. diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index 3fb5c7dc5..28b52901a 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -1257,7 +1257,7 @@ gboolean nm_system_should_modify_resolv_conf (void) if (!file) goto out_gfree; - buf = svGetValue (file, "MODIFY_RESOLV_CONF_DYNAMICALLY"); + buf = svGetValue (file, "DHCLIENT_MODIFY_RESOLV_CONF"); if (!buf) goto out_close;