Ubuntu 8.04 fixes

diff --git a/ldap-client/CHANGELOG b/ldap-client/CHANGELOG
index c9d29af..245668e 100644 (file)
--- a/ldap-client/CHANGELOG
+++ b/ldap-client/CHANGELOG
@@ -5,3 +5,5 @@ Added Module Config options for specifying a different LDAP server to connect to
 Object and attribute lists in the LDAP browser are now sorted.
 ---- Changes since 1.400 ----
 On Debian/Ubuntu systems with separate PAM and NSS LDAP config files, offer to link them with a new button.
+---- Changes since 1.410 ----
+Handle new LDAP config config file path seen on Ubuntu 8.04.

diff --git a/ldap-client/config-debian-linux-3.1-* b/ldap-client/config-debian-linux-3.1
similarity index 100%
rename from ldap-client/config-debian-linux-3.1-*
rename to ldap-client/config-debian-linux-3.1

diff --git a/ldap-client/config-debian-linux-4.0-* b/ldap-client/config-debian-linux-4.0-*
new file mode 100644 (file)
index 0000000..9e767d3
--- /dev/null
+++ b/ldap-client/config-debian-linux-4.0-*
@@ -0,0 +1,2 @@
+auth_ldap=/etc/ldap.conf
+secret=/etc/ldap.secret

diff --git a/ldap-client/lang/en b/ldap-client/lang/en
index 088b818..bce9411 100644 (file)
--- a/ldap-client/lang/en
+++ b/ldap-client/lang/en
@@ -108,6 +108,7 @@ ldap_emodule=The $1 Perl module needed for talking to the LDAP server is not ins
 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
+ldap_eparse=Could not parse the LDAP server URI $1
 
 browser_title=LDAP Browser
 browser_econn=The LDAP browser cannot be used : $1

diff --git a/ldap-client/ldap-client-lib.pl b/ldap-client/ldap-client-lib.pl
index 0169340..c4a95c9 100644 (file)
--- a/ldap-client/ldap-client-lib.pl
+++ b/ldap-client/ldap-client-lib.pl
@@ -185,7 +185,7 @@ if ($config{'ldap_hosts'}) {
 elsif ($uri) {
        # Using uri directive
        foreach $u (split(/\s+/, $uri)) {
-               if ($u =~ /^(ldap|ldaps):\/\/([a-z0-9\_\-\.]+)(:(\d+))?/) {
+               if ($u =~ /^(ldap|ldaps|ldapi):\/\/([a-z0-9\_\-\.]+)(:(\d+))?/) {
                        ($proto, $host, $port) = ($1, $2, $4);
                        if (!$port && $proto eq "ldap") {
                                $port = 389;
@@ -206,6 +206,9 @@ elsif ($uri) {
                                }
                        }
                }
+       if (!$ldap) {
+               $err = &text('ldap_eparse', $uri);
+               }
        }
 else {
        # Using host and port directives