From f93a084d4b164c8392f288581d982fef55049bb2 Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 26 Feb 2008 17:05:06 +0000 Subject: [PATCH] Fixed URL extraction git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9134 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/modules/SIPackages.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm index d85d0b05d..50efa409c 100644 --- a/gosa-si/modules/SIPackages.pm +++ b/gosa-si/modules/SIPackages.pm @@ -752,17 +752,17 @@ sub new_ldap_config { @servers= sort (@servers); foreach $server (@servers){ - # Conversation for backward compatibility - if (not $server =~ /^ldap[^:]+:\/\// ) { - if ($server =~ /^([^:]+):(.*)$/ ) { - $server= "1:dummy:ldap://$1/$2"; - } - } + # Conversation for backward compatibility + if (not $server =~ /^\d+:[^:]+:ldap[^:]*:\/\// ) { + if ($server =~ /^([^:]+):(.*)$/ ) { + $server= "1:dummy:ldap://$1/$2"; + } + } - $base= $server; - $server =~ s%^[^:]+:[^:]+:(ldap.*://[^/]+)/.*$%$1%; - $base =~ s%^[^:]+:[^:]+:ldap.*://[^/]+/(.*)$%$1%; - push (@ldap_uris, $server); + $base= $server; + $server =~ s%^[^:]+:[^:]+:(ldap.*://[^/]+)/.*$%$1%; + $base =~ s%^[^:]+:[^:]+:ldap.*://[^/]+/(.*)$%$1%; + push (@ldap_uris, $server); } # Assemble data package -- 2.30.2