Re-factor LDAP connection code to a new function

diff --git a/ldap-client/check.cgi b/ldap-client/check.cgi
index a431e99..f34e830 100755 (executable)
--- a/ldap-client/check.cgi
+++ b/ldap-client/check.cgi
@@ -20,13 +20,13 @@ else {
 
 # Attempt to connect to LDAP server
 print $text{'check_connect'},"<br>\n";
-$ldap = &ldap_connect(1, \$host);
+$ldap = &ldap_connect(1);
 if (!ref($ldap)) {
        &print_problem(&text('check_econnect', $ldap));
        goto END;
        }
 else {
-       print &text('check_connected', $host),"<p>\n";
+       print &text('check_connected', $ldap->host()),"<p>\n";
        }
 
 # Work out the scope

diff --git a/ldap-client/lang/en b/ldap-client/lang/en
index 5d70971..235f036 100644 (file)
--- a/ldap-client/lang/en
+++ b/ldap-client/lang/en
@@ -107,6 +107,8 @@ switch_srcs=Data sources
 switch_return=services using LDAP
 
 ldap_emodule=The $1 Perl module needed for talking to the LDAP server is not installed. <a href='$2'>Click here</a> to have Webmin download and install it now.
+ldap_emodule2=The $1 Perl module needed for talking to the LDAP server is not installed.
+ldap_econf=The LDAP client configuration file $1 was not found on your system
 ldap_econn=Failed to connect to LDAP server $1 port $2
 ldap_elogin=Failed to bind to LDAP server $1 as $2 : $3
 ldap_anon=anonymous

diff --git a/ldap-client/ldap-client-lib.pl b/ldap-client/ldap-client-lib.pl
index 57a0f22..88feadd 100644 (file)
--- a/ldap-client/ldap-client-lib.pl
+++ b/ldap-client/ldap-client-lib.pl
@@ -155,15 +155,40 @@ if ($@) {
        if ($_[0]) { return $err; }
        else { &error($err); }
        }
+local $err = &generic_ldap_connect($config{'ldap_hosts'}, $config{'ldap_port'},
+                            $config{'ldap_tls'}, $config{'ldap_user'},
+                            $config{'ldap_pass'});
+if (ref($err)) { return $err; }                # Worked
+elsif ($_[0]) { return $err; }         # Caller asked for error return
+else { &error($err); }                 # Caller asked for error() call
+}
+
+# generic_ldap_connect([host], [port], [login], [password])
+# A generic function for connecting to an LDAP server. Uses the system's
+# LDAP client config file if any parameters are missing. Returns the LDAP
+# handle on success or an error message on failure.
+sub generic_ldap_connect
+{
+local ($ldap_hosts, $ldap_port, $ldap_ssl, $ldap_user, $ldap_pass) = @_;
+
+# Check for perl module and config file
+eval "use Net::LDAP";
+if ($@) {
+       return &text('ldap_emodule2', "<tt>Net::LDAP</tt>");
+       }
+if (!-r $config{'auth_ldap'}) {
+       $ldap_hosts && $ldap_user && $ldap_pass ||
+               return &text('ldap_econf', "<tt>$config{'auth_ldap'}</tt>");
+       }
 
 # Get the host and port
 local $conf = &get_config();
 local $uri = &find_svalue("uri", $conf);
 local ($ldap, $use_ssl, $err);
 local $ssl = &find_svalue("ssl", $conf);
-if ($config{'ldap_hosts'}) {
+if ($ldap_hosts) {
        # Using hosts from module config
-       local @hosts = split(/\s+/, $config{'ldap_hosts'});
+       local @hosts = split(/\s+/, $ldap_hosts);
        if ($config{'ldap_tls'} ne '') {
                $use_ssl = $config{'ldap_tls'};
                }
@@ -171,13 +196,12 @@ if ($config{'ldap_hosts'}) {
                $use_ssl = $ssl eq 'yes' ? 1 :
                           $ssl eq 'start_tls' ? 2 : 0;
                }
-       local $port = $config{'ldap_port'} ||
+       local $port = $ldap_port ||
                      &find_svalue("port", $conf) ||
                      ($use_ssl == 1 ? 636 : 389);
        foreach $host (@hosts) {
                $ldap = Net::LDAP->new($host, port => $port,
                                schema => $use_ssl == 2 ? 'ldaps' : 'ldap');
-               ${$_[1]} = $host if ($_[1]);
                if (!$ldap) {
                        $err = &text('ldap_econn',
                                     "<tt>$host</tt>", "<tt>$port</tt>");
@@ -201,7 +225,6 @@ elsif ($uri) {
                                }
                        $ldap = Net::LDAP->new($host, port => $port,
                                               scheme => $proto);
-                       ${$_[1]} = $host if ($_[1]);
                        if (!$ldap) {
                                $err = &text('ldap_econn',
                                             "<tt>$host</tt>","<tt>$port</tt>");
@@ -230,7 +253,6 @@ else {
        foreach $host (@hosts) {
                $ldap = Net::LDAP->new($host, port => $port,
                               schema => $use_ssl == 1 ? 'ldaps' : 'ldap');
-               ${$_[1]} = $host if ($_[1]);
                if (!$ldap) {
                        $err = &text('ldap_econn',
                                     "<tt>$host</tt>", "<tt>$port</tt>");
@@ -253,16 +275,15 @@ if ($use_ssl == 2 && !$err) {
        }
 
 if ($err) {
-       if ($_[0]) { return $err; }
-       else { &error($err); }
+       return $err;
        }
 
 local ($dn, $password);
 local $rootbinddn = &find_svalue("rootbinddn", $conf);
-if ($config{'ldap_user'}) {
+if ($ldap_user) {
        # Use login from config
-       $dn = $config{'ldap_user'};
-       $password = $config{'ldap_pass'};
+       $dn = $ldap_user;
+       $password = $ldap_pass;
        }
 elsif ($rootbinddn) {
        # Use the root login if we have one
@@ -275,11 +296,11 @@ else {
        $password = &find_svalue("bindpw", $conf);
        }
 local $mesg;
-if ($dn) {
+if ($password) {
        $mesg = $ldap->bind(dn => $dn, password => $password);
        }
 else {
-       $mesg = $ldap->bind(anonymous => 1);
+       $mesg = $ldap->bind(dn => $dn, anonymous => 1);
        }
 if (!$mesg || $mesg->code) {
        local $err = &text('ldap_elogin', "<tt>$host</tt>",