From ae43f9275d59f2f3d5c283ee7f5e2254b838b847 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Fri, 11 Sep 2009 18:06:08 -0700
Subject: Fix Bug 4919 "service dns" branch of configuration file missing ... *
 use new API to get active 'original + commited' values * split 'dns
 forwarding' and 'dns dynamic' into different priorities

---
 lib/Vyatta/Misc.pm | 2 +-
 templates/priority | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 7f5e506..cdbbef9 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -58,7 +58,7 @@ sub is_dhcp_enabled {
       if ($outside_cli);
 
     $config->setLevel( $intf->path() );
-    foreach my $addr ( $config->returnOrigValues('address') ) {
+    foreach my $addr ( $config->returnOrigPlusComValues('address') ) {
         return 1 if ( $addr && $addr eq "dhcp" );
     }
 
diff --git a/templates/priority b/templates/priority
index 274d8b8..6d22315 100644
--- a/templates/priority
+++ b/templates/priority
@@ -153,12 +153,13 @@
 900 service
 910 service/dhcp-relay
 911 service/dhcp-server
-912 service/dns
 913 service/https
 914 service/nat
 915 service/ssh
 916 service/telnet
 917 service/webproxy
+918 service/dns/forwarding
+919 service/dns/dynamic
 960 cluster
 970 zone-policy/zone/node.tag/from
 975 zone-policy
-- 
cgit v1.2.3