www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
20,581 Commits 62 Branches 304 Tags
433c97df4e100b7ae76bc3db406eeb4d901b9700
Commit Graph

129 Commits

Author SHA1 Message Date
Eric Covener
6f970f48dc spurious 401s with message "DN has not been defined" when cache expiration happens in another thread 
PR 43786


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@591499 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-02 22:33:36 +00:00
Eric Covener
a2897ec7a5 fix pool misuse around mod_ldap's connection cache, previously pconf 
could be used during request processing

(the apr_ldap_foo only need a pool for temporary data anyway)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@591488 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-02 21:58:57 +00:00
Eric Covener
ad8cfa7300 AFAICT, LDAP_CACHE_LOCK was a no-op when virtualhosts were used 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@567091 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-17 17:33:11 +00:00
Paul J. Reder
ca8e9d2988 A couple of cleanups to the nested group code based on review comments. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562165 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-02 16:17:17 +00:00
Paul J. Reder
cc4a706e61 mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability 
to authorize an authenticated user via a "require ldap-group X" directive
     where the user is not in group X, but is in a subgroup contained in X.
     PR 42891 [Paul J. Reder]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560373 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-27 20:34:41 +00:00
Eric Covener
7853970441 Copy the enum into an integer before sending off to the LDAP SDK, to avoid 
passing the address of a short (seen on z/OS)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557778 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-19 21:13:36 +00:00
Eric Covener
f65de07e7e revert revision 555470 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557772 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-19 21:05:16 +00:00
Eric Covener
4a3fae2079 Remove dead macros for certificate types that are already replaced by 
APR-prefixed versions in apr-util (apr_ldap_option.h).

Submitted by: David Jones


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555629 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-12 14:00:33 +00:00
Eric Covener
ab845c1671 This data is passed in an unsafe way to the LDAP SDK if the compiler 
chooses to use shorts for the enum values.
http://www.redbooks.ibm.com/redbooks/SG245992/nn4/SG245992_88.html

Submitted by: David Jones


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555470 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-12 02:42:44 +00:00
Bradley Nicholes
f01effcaea Remove the hardcoded size limit parameter for ldap_search_ext_s 
and replace it with an APR_ defined value that is set according
to the LDAP SDK being used.

Submitted by: David Jones <oscaremma gmail com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@517788 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-13 17:53:22 +00:00
Jeff Trawick
4d55f1f475 mod_ldap: Fix the search limit parameter to ldap_search_ext_s() 
for SDKs that define LDAP_NO_LIMIT to something other than -1.

Submitted by: David Jones <oscaremma gmail.com>
Reviewed by:  trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@509237 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-19 16:24:33 +00:00
Jim Jagielski
01fddca7f7 format change. no functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@484985 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-09 14:19:36 +00:00
Bradley Nicholes
73fb27c5df Better detection and clean up of ldap connection that have been 
terminated by the ldap server. PR#40878

Submitted by: Rob Baily <rbaily servicebench com>
Reviewed by: bnicholes



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@472633 13f79535-47bb-0310-9956-ffa450edef68
 2006-11-08 20:43:46 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Roy T. Fielding
778fd134e0 revert accidental copyright year changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395423 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 23:03:26 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
Greg Ames
b8370ab007 more explanation for a couple of subtle lines of code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393236 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-11 14:41:53 +00:00
Greg Ames
e1fbc27d1a expand on a comment for a rather subtle line of code so I have a chance of 
understanding how it helps in the future


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393028 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-10 19:24:33 +00:00
Bradley Nicholes
23520cd701 revert the LDAPConnectionTimeout and LDAPVerifyServerCert directives back to GLOBAL_ONLY since the various LDAP SDK's don't allow these settings on a per-connection basis 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@387675 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-22 00:08:05 +00:00
Bradley Nicholes
a7c95e73b9 Remove the global only flag from the LDAPConnectionTimeout directive and add it to all of the caching directives 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386751 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-17 22:52:21 +00:00
Bradley Nicholes
23c7395f3e Fix the server_merge so that the memory pools and mutexes that were created during the server_create, are used. Allow the settings that can be overwritten in a vhost to use the vhost values 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386698 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-17 19:26:27 +00:00
Bradley Nicholes
dbc7dbe019 remove the race condition when creating the connection pool mutex. Also eliminate some unnecessary uses of the global memory pool 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386477 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 23:02:57 +00:00
Bradley Nicholes
407ef2a3f5 Set the LDAP protocol before setting extended LDAP options. [PR38146] 
Submitted by: Aaron Richton <richton nbcs.rutgers.edu>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@370856 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-20 16:53:43 +00:00
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-16 16:31:25 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:05:51 +00:00
Paul Querna
00feac4b96 Do not set r->content_type directly, use our ap_set_content_type API, so that output filters can properly be applied. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321436 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-15 18:48:03 +00:00
Jim Jagielski
f2ed4fda66 Consistantly use APR_PID_T_FMT for getpid value 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265049 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-31 14:23:33 +00:00
Joe Orton
5143fec07d * modules/ldap/util_ldap.c (util_ldap_parse_cert_type): Fix gcc 4 
warning "type qualifiers ignored on function return type".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231014 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-09 08:21:39 +00:00
Joe Orton
e4ff0cc58d * modules/ldap/util_ldap.c (util_ldap_post_config): Pass NULL to 
apr_global_mutex_create if no cache file name is specified, rather
than inventing an inappropriate name with tmpnam().

PR: 30385


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227230 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-03 14:44:29 +00:00
Joe Orton
9562ffb5cc * modules/ldap/util_ldap.c (util_ldap_post_config): Fail if 
util_ldap_cache_init fails; let ap_log_error call strerror.
Downgrade informational messages to APLOG_INFO from APLOG_NOTICE.
(util_ldap_child_init): Remove some noisy but fairly pointless
debugging output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226974 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-02 09:26:51 +00:00
Joe Orton
01acb7f836 * modules/ldap/util_ldap.c (util_ldap_post_config): Don't attempt to 
remove the shm segment here.

* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Properly
remove the shm segment here before creating a new one; don't attach to
any existing shm segment if apr_shm_create() fails.
(util_ldap_cache_module_kill): Don't attempt to remove the shm segment
here; apr_shm_destroy() does that anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226809 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-01 14:50:21 +00:00
Joe Orton
1dc07b9e89 * modules/ldap/util_ldap.c, modules/aaa/mod_authnz_ldap.c: Stop using 
APLOG_NOERRNO throughout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225794 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 15:00:46 +00:00
Joe Orton
93004fd4d8 * modules/ldap/util_ldap.c: Remove DOCTYPE_* macros duplicated from 
httpd.h.  Remove redundant prototypes of static functions which aren't
used before they are declared.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225734 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:50:16 +00:00
Joe Orton
8a8be2dde5 * modules/ldap/util_ldap.c (util_ldap_cmds): Make static const. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225733 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:43:01 +00:00
Joe Orton
9afa1542f0 * modules/ldap/util_ldap.c (LDAP_CACHE_LOCK, LDAP_CACHE_UNLOCK): 
Wrap in do/while for safety.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225732 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-28 09:40:08 +00:00
William A. Rowe Jr
d2ff850241 End abuse of apr_strnat[case]cmp - it isn't str[case]cmp. 
Unsure if apr_strnatcasecmp(conf_ip, uri_ip) was intentional, on the
  off chance that the left or right hand ip string happens to contain
  leading zeros.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@216111 13f79535-47bb-0310-9956-ffa450edef68
 2005-07-13 04:43:59 +00:00
Bradley Nicholes
b119277791 Make sure that the LDAPVerifyServerCert patch is compatibile with apr-util 1.1.x. Once apr-util 1.2 is released, the ifdef's need to be removed and apr_ldap_set_option() will handle the SDK differences. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169834 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-12 15:35:55 +00:00
Bradley Nicholes
1439ca9d5c Add the LDAPVerifyServerCert directive to util_ldap to force 
verification of a server certificate when establishing an SSL connection
to the LDAP server


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169705 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-11 22:34:18 +00:00
Bradley Nicholes
c153cbd6c2 Fix the static function declarations in the prototypes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168023 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-03 23:51:05 +00:00
Bradley Nicholes
f05f8523c4 Move the ldap_set_option() call to set the connection time from being global to being connection specific. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164919 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-26 23:52:41 +00:00
William A. Rowe Jr
9a692d5f71 An aggressive visit by the style faerie. Sprinkled some comment cleanups 
and tightened the 'single line result' of the error message for LDAP
directives (which also broke the 80 column gospel in source.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160552 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 12:55:23 +00:00
William A. Rowe Jr
2f91875b05 Fix Win32 breakage - these hook providers can't be _DECLARE()ed, 
they -would- be _DECLARE_NONSTD ... except that no functions within
  mod_ldap need to be exported at all.  All functions can be static,
  as they are registered via callbacks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160498 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 00:18:36 +00:00
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