summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-10 15:00:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-10 15:00:52 +0000
commitd6dd298ae59a457c8ad7a3af718a794ed9c59a96 (patch)
treea37408cf85a49b202a1efb43020c23b684016719
parente70af9c6aff2c57bd822415a1e3fd2b8cb994567 (diff)
downloadurpmi-d6dd298ae59a457c8ad7a3af718a794ed9c59a96.tar
urpmi-d6dd298ae59a457c8ad7a3af718a794ed9c59a96.tar.gz
urpmi-d6dd298ae59a457c8ad7a3af718a794ed9c59a96.tar.bz2
urpmi-d6dd298ae59a457c8ad7a3af718a794ed9c59a96.tar.xz
urpmi-d6dd298ae59a457c8ad7a3af718a794ed9c59a96.zip
fix regression (introduced long ago: 2006-11-15): correctly detect ldap is not configured
(otherwise it introduces weird issues...)
-rw-r--r--urpm/ldap.pm6
1 files 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"}) {