1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Commit Graph

36 Commits

Author SHA1 Message Date
Bradley Nicholes
38e8b5da89 Implement the exported function from mod_ldap(util_ldap) as optional functions so that we can eliminate the load ordering of mod_ldap and mod_authnz_ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159619 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 18:44:16 +00:00
Paul Querna
3982db6f2d Turn LDAPTrustedClientCert and LDAPTrustedMode into the RSRC_CONF context. The current code is broken for use as OR_ALL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158678 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 21:35:02 +00:00
Bradley Nicholes
a92c5fa98c Keep track of the number of attributes retrieved from LDAP so that all the values can be properly cached even if the value is NULL. [PR 33901]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156587 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 00:15:01 +00:00
Bradley Nicholes
803296f97c If the search fails due to a bad connection, make sure that we unbind the connection so that it will be recreated the next time it is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155713 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 23:25:26 +00:00
Joe Orton
edb46b1de9 * include/util_ldap.h (util_ldap_state_t): Fix gcc format string
warnings: use a long for connectionTimeout since the code expects a
long.

* modules/ldap/util_ldap.c (compare_client_certs): Make static to fix
gcc missing-prototype warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153390 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:22:16 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Bradley Nicholes
13050b4ff6 Allow AuthLDAPURL to override the default connection type with an option second parameter of NONE, SSL or TLS | STARTTLS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151083 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 00:03:37 +00:00
Bradley Nicholes
de2792bc7d Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149421 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 17:27:04 +00:00
Bradley Nicholes
cebf3cf9e9 Set the connection timeout for LDAP SDK's that support the option. For SDK's that don't, log a warning message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149419 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 17:09:56 +00:00
Bradley Nicholes
30eea48f9b Added a new LDAPConnectionTimeout directive to util_ldap so that the socket connection timeout value is configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126565 13f79535-47bb-0310-9956-ffa450edef68
2005-01-27 01:13:15 +00:00
Graham Leggett
3d71c8de71 Remove the workaround that got client certificates to work with non
Novell LDAP SDKs, as it is no longer needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125936 13f79535-47bb-0310-9956-ffa450edef68
2005-01-21 15:42:53 +00:00
Bradley Nicholes
0a2c453dd2 Recognize the new certificate formats
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125810 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 20:22:31 +00:00
Graham Leggett
cd8d0204f7 Fix a problem where SSL was started twice when no client certificates were
specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125733 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 08:15:46 +00:00
Bradley Nicholes
ee9eaa7f7c Fix some inline C++ style declarations that other compilers can't handle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125676 13f79535-47bb-0310-9956-ffa450edef68
2005-01-19 22:39:19 +00:00
Graham Leggett
c78537114e mod_ldap: Updated to use the new apr-util v1.1 apr_ldap_*_option()
API for the setting of server and client SSL certificates. Replaced
LDAPTrustedCA directive with LDAPTrustedGlobalCert and
LDAPTrustedClientCert directives to correctly support global certs
(CA certs / Netware client certs) and per connection client certs
as supported by Netware, OpenLDAP and Netscape/Mozilla.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125645 13f79535-47bb-0310-9956-ffa450edef68
2005-01-19 19:52:08 +00:00
William A. Rowe Jr
8aea7cff22 Correct the order of includes to follow httpd conventions, and get
Win32 compiling again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124279 13f79535-47bb-0310-9956-ffa450edef68
2005-01-05 21:35:51 +00:00
Graham Leggett
0dfcbc1ad8 Fix some compiler warnings inside the LDAP modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124187 13f79535-47bb-0310-9956-ffa450edef68
2005-01-05 07:07:46 +00:00
Bradley Nicholes
056dd98130 If the entry has a password then don't allow util_ldap_cache_getuserdn() to update the expiration timeout since it has no idea when the password was last validated.
Submitted by: Jari Ahonen [jah progress.com]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105681 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 15:46:51 +00:00
Bradley Nicholes
05556534cd Implement the util_ldap_cache_getuserdn() API so that the ldap authorization only modules have access to the util_ldap user cache without have to require ldap authentication as well. Also required by mod_authnz_ldap so that it's authorization functionality can be used independant from the authentication functionality. [PR 31898]
Submitted by: Jari Ahonen [jah progress.com]
Reviewed by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105667 13f79535-47bb-0310-9956-ffa450edef68
2004-11-01 23:43:24 +00:00
Bradley Nicholes
18a1a014e6 Since the host will include a port if the default port is not used, always specify the default ports for the port parameter. This will allow a host string that contains multiple hosts the ability to mix some hosts with ports and some without. All hosts which do not specify a port will use the default port. #30592
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105596 13f79535-47bb-0310-9956-ffa450edef68
2004-10-25 18:32:58 +00:00
Graham Leggett
3be30e07c3 mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.
PR:
Obtained from:
Submitted by:	Jeff Trawick
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105453 13f79535-47bb-0310-9956-ffa450edef68
2004-10-14 11:31:48 +00:00
Joe Orton
8aaa48d5e2 * modules/ldap/util_ldap.c (util_ldap_child_init): Don't segfault if
the cache has been disabled (when _cache_lock == NULL).
(util_ldap_post_config): Set mutex permissions if necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105412 13f79535-47bb-0310-9956-ffa450edef68
2004-10-12 12:16:42 +00:00
Graham Leggett
0e9a37b863 mod_ldap: fix a bogus error message to tell the user which file
is causing a potential problem with the LDAP shared memory cache.
PR:	31431
Obtained from:
Submitted by:	Graham Leggett
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105375 13f79535-47bb-0310-9956-ffa450edef68
2004-10-03 16:44:06 +00:00
Graham Leggett
b611143e42 Fix the global mutex crash when the global mutex is never allocated due
to disabled/empty caches.
PR:
Obtained from:
Submitted by:	Jess Holle <jessh ptc.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105208 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 23:11:10 +00:00
Joe Orton
733fefe0b8 * modules/ldap/util_ldap.c (util_ldap_post_config): Fix false
positives from gcc -Wformat-security.

* modules/ldap/util_ldap_cache.c (util_ldap_url_node_display): Add default
to switch to avoid uninitialised variable warnings.

* modules/ldap/util_ldap_cache_mgr.c (util_ald_create_caches): Fix to
return NULL rather than random chunk from stack on error path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105105 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 10:59:55 +00:00
Bradley Nicholes
abb23e5ee7 Preserve the return value from the apr_stat() call so that it can be displayed in the error log message. (Done right this time)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104820 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 16:46:55 +00:00
Bradley Nicholes
ca11a13fc3 Preserve the return value from the apr_stat() call so that it can be displayed in the error log message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104817 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 15:24:51 +00:00
Bradley Nicholes
85b153052e Since OpenLDAP doesn't validate the certificate until it tries to use it, at lease make sure that the file path is good during configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104776 13f79535-47bb-0310-9956-ffa450edef68
2004-08-23 23:25:12 +00:00
Bradley Nicholes
8c9b218b6b Clean up some compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104727 13f79535-47bb-0310-9956-ffa450edef68
2004-08-19 18:08:19 +00:00
Bradley Nicholes
871dcc3f67 Move util_ldap out of experimental and into ldap.
See Attic in experimental directory for previous change history.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104718 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 22:18:39 +00:00
Ryan Bloom
74f34a272e Remove all of the ldap modules. These have been moved to their own
repository, httpd-ldap, and they now form their own sub-project of the
httpd project.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91508 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 21:32:41 +00:00
Graham Leggett
2d122b4e55 Add specified user attributes to the environment when using
mod_auth_ldap. This allows you to use mod_include to embed specified
user attributes in a page like so:
Hello <!--#echo var="AUTHENTICATE_CN"-->, how are you?
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90775 13f79535-47bb-0310-9956-ffa450edef68
2001-08-28 23:16:12 +00:00
Martin Kraemer
e811bc50a1 Use uniform wrapping for unistd.h, and don't include it if it's aready included via fileio.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90491 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 15:40:29 +00:00
Graham Leggett
38c3d804d5 Enabled negative caching on attribute comparisons in the LDAP cache.
Fixed a problem where the default cache TTL was set in milliseconds
not microseconds causing the cache to time out almost immediately.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90340 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 21:10:03 +00:00
Graham Leggett
0862fbcad8 Fixed LDAP cleanup on graceful restarts. LDAP connections are now
cleaned up when the connection pool pool is cleaned up.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90336 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 19:18:12 +00:00
Graham Leggett
011142a2af Landing of mod_ldap - the LDAP cache and connection pooling module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90321 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 16:43:27 +00:00