From 6ef3d88110fd44b51733d03ff01f5f84aa327fb7 Mon Sep 17 00:00:00 2001 From: luke Date: Thu, 15 Jun 2006 15:17:26 +0000 Subject: fixing interpreter to initialize ldap in the nodesearch_ldap method, which really only matters for testing (since it is already being inited in the nodesearch method git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1287 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/parser/interpreter.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 09ad2382f..04074d695 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -183,8 +183,11 @@ module Puppet # the critical data. def nodesearch_ldap(node) unless defined? @ldap and @ldap - Puppet.info "Skipping ldap source; no ldap connection" - return nil, [] + setup_ldap() + unless @ldap + Puppet.info "Skipping ldap source; no ldap connection" + return nil, [] + end end if node =~ /\./ @@ -250,7 +253,6 @@ module Puppet # evaluate our whole tree def run(client, facts) - # We have to leave this for after initialization because there # seems to be a problem keeping ldap open after a fork. unless @setup -- cgit