From: eseyman%linagora.com <>
Date: Fri, 27 Jun 2008 21:42:47 +0000 (+0000)
Subject: Bug 441503: Need update on contrib/syncLDAP.pl
X-Git-Tag: bugzilla-3.2rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b205ed978c6b86f3c2de988dcb2ac86f19173600;p=thirdparty%2Fbugzilla.git

Bug 441503: Need update on contrib/syncLDAP.pl
Patch by A.A. Shimono <shimono@mozilla.gr.jp> r=manu a=LpSolit
---

diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index dc0708f605..51ee5c1fa1 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -96,12 +96,19 @@ if ($LDAPserver eq "") {
    print "No LDAP server defined in bugzilla preferences.\n";
    exit;
 }
-my $LDAPport = "389";  # default LDAP port
-if($LDAPserver =~ /:/) {
-    ($LDAPserver, $LDAPport) = split(":",$LDAPserver);
+
+my $LDAPconn;
+if($LDAPserver =~ /\:\/\//) {
+    # if the "LDAPserver" parameter is in uri scheme
+    $LDAPconn = Net::LDAP->new($LDAPserver, version => 3);
+} else {
+    my $LDAPport = "389";  # default LDAP port
+    if($LDAPserver =~ /:/) {
+        ($LDAPserver, $LDAPport) = split(":",$LDAPserver);
+    }
+    $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3);
 }
 
-my $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3);
 if(!$LDAPconn) {
    print "Connecting to LDAP server failed. Check LDAPserver setting.\n";
    exit;