diff options
| author | lpsolit%gmail.com <> | 2006-06-02 20:52:48 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2006-06-02 20:52:48 +0200 |
| commit | 9ba60234f46f8f5a291983111951c6158671f7d7 (patch) | |
| tree | 0722ca5e7d2283d0c163e08ac87f9a1404d33500 /template/en | |
| parent | 2b9f5bf80911872ca809061bd46d8fc7f64c2929 (diff) | |
| download | bugzilla-9ba60234f46f8f5a291983111951c6158671f7d7.tar.gz bugzilla-9ba60234f46f8f5a291983111951c6158671f7d7.tar.xz | |
Bug 282687: LDAP: TLS Support - Patch by guillomovitch@zarb.org r=mkanat a=justdave
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/admin/params/ldap.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl index 0490aa675..aef2713b1 100644 --- a/template/en/default/admin/params/ldap.html.tmpl +++ b/template/en/default/admin/params/ldap.html.tmpl @@ -29,6 +29,9 @@ "(e.g. ldap.company.com, or ldap.company.com:portnum). " _ "Can be prefixed with ldap:// (default) or ldaps:// (for a secure connection).", + LDAPstartls => "Whether to require encrypted communication once normal " _ + "LDAP connection achieved with the server.", + LDAPbinddn => "If your LDAP server requires that you use a binddn and password " _ "instead of binding anonymously, enter it here " _ "(e.g. cn=default,cn=user:password). " _ diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a83629713..0ec46461f 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -270,6 +270,9 @@ [% ELSIF error == "ldap_connect_failed" %] Could not connect to the LDAP server <code>[% server FILTER html %]</code>. + [% ELSIF error == "ldap_start_tls_failed" %] + Could not start TLS with LDAP server: <code>[% error FILTER html %]</code>. + [% ELSIF error == "ldap_search_error" %] An error occurred while trying to search LDAP for "[% username FILTER html %]": |