From 01a5ebfbe20ff99526f63cf3548a007f97d93a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Hern=C3=A1ndez-Novich?= Date: Sun, 12 Oct 2008 18:40:22 +0000 Subject: [PATCH] Fixed validation so LDAPLink takes ldap:// and ldaps:// URIs. Net::LDAP does The Right Thing (tm) when given an ldaps:// URI provided the administrator has properly set up /etc/ldap/ldap.conf with the CA Cert signing the Server's certificate. Succesfully tested ldap://my.ldap.server/ ldap://my.ldap.server:389/ (with and without TLS) ldaps://my.ldap.server/ ldaps://my.ldap.server:636/ This patch should be backported to 7.5 :-) --- lib/WebGUI/Operation/LDAPLink.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm index a34798908..1d2682e7f 100644 --- a/lib/WebGUI/Operation/LDAPLink.pm +++ b/lib/WebGUI/Operation/LDAPLink.pm @@ -118,7 +118,7 @@ sub validateForm { } # Check format of ldapUrl - push(@{$errors}, $i18n->get("ldap url malformed")) unless ($formFields->{ldapUrl} =~ m!^ldap://.*!); + push(@{$errors}, $i18n->get("ldap url malformed")) unless ($formFields->{ldapUrl} =~ m!^ldaps?://.*!); # Other checks here