summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorMichael Scherer <misc@mandriva.com>2005-05-16 11:06:11 +0000
committerMichael Scherer <misc@mandriva.com>2005-05-16 11:06:11 +0000
commita5b90f7e5d52dd86668969d7082ce49a71d8b580 (patch)
treec7b192e63f6729570f94f60ae3836e36329974bf /urpm
parent270b60861c2b3425ebb1be2c8c526488f7159635 (diff)
downloadurpmi-a5b90f7e5d52dd86668969d7082ce49a71d8b580.tar
urpmi-a5b90f7e5d52dd86668969d7082ce49a71d8b580.tar.gz
urpmi-a5b90f7e5d52dd86668969d7082ce49a71d8b580.tar.bz2
urpmi-a5b90f7e5d52dd86668969d7082ce49a71d8b580.tar.xz
urpmi-a5b90f7e5d52dd86668969d7082ce49a71d8b580.zip
- really detect http and ftp proxy
Diffstat (limited to 'urpm')
-rw-r--r--urpm/ldap.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index e7dfdee7..4faa4653 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -11,7 +11,9 @@ my $LDAP_CONFIG_FILE = '/etc/ldap.conf';
# FIXME duplication
my @per_media_opt = qw(
downloader
+ ftp-proxy
hdlist
+ http-proxy
ignore
key-ids
list
@@ -136,8 +138,10 @@ sub get_ldap_config_dns {
my %ldap_changed_attributes = (
'source-name' => 'name',
- url => 'clear_url',
+ 'url' => 'clear_url',
'with-hdlist' => 'with_hdlist',
+ 'http-proxy' => 'http_proxy',
+ 'ftp-proxy' => 'ftp_proxy',
);
sub load_ldap_media($%) {