From a1858981fbe2f4bf8fa164b56d66be08c2f6a026 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Fri, 30 Jul 2010 16:13:02 -0700
Subject: new API changes

---
 lib/Vyatta/Misc.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 44c0459..5373f7f 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -54,11 +54,11 @@ sub is_dhcp_enabled {
     return unless $intf;
 
     my $config = new Vyatta::Config;
-    $config->{_active_dir_base} = "/opt/vyatta/config/active/"
-      if ($outside_cli);
 
     $config->setLevel( $intf->path() );
-    foreach my $addr ( $config->returnOrigPlusComValues('address') ) {
+    # the "effective" observers can be used both inside and outside
+    # config sessions.
+    foreach my $addr ( $config->returnEffectiveValues('address') ) {
         return 1 if ( $addr && $addr eq "dhcp" );
     }
 
-- 
cgit v1.2.3