From d6dd298ae59a457c8ad7a3af718a794ed9c59a96 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 10 Jan 2008 15:00:52 +0000
Subject: fix regression (introduced long ago: 2006-11-15): correctly detect
 ldap is not configured (otherwise it introduces weird issues...)

---
 urpm/ldap.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 5489948a..f93dde73 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -119,9 +119,7 @@ sub get_ldap_config() {
 
 sub get_ldap_config_file {
     my ($file) = @_;
-    my %config = (
-	ssl => 'off',
-    );
+    my %config;
     foreach (cat_($file)) {
 	s/#.*//;
 	s/^\s*//;
@@ -152,6 +150,8 @@ sub load_ldap_media {
 
     my $config = get_ldap_config() or return;
 
+    $config->{ssl} = 'off';
+
     # try first urpmi_foo and then foo
     foreach my $opt (qw(base uri filter host ssl port binddn passwd scope)) {
         if (!defined $config->{$opt} && defined $config->{"urpmi_$opt"}) {
-- 
cgit v1.2.1