mod-auth-commit Mailing List for mod_auth (Page 3)
Brought to you by:
firechipmunk,
honx
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(36) |
Dec
(8) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(7) |
Feb
(51) |
Mar
(22) |
Apr
|
May
(6) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <fir...@us...> - 2004-02-08 23:00:18
|
Update of /cvsroot/mod-auth/mod_authn_cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3473 Added Files: AUTHORS COPYING ChangeLog README TODO autogen.sh configure.in Log Message: proper auto* foo --- NEW FILE: AUTHORS --- Paul Querna --- NEW FILE: COPYING --- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --- NEW FILE: ChangeLog --- --- NEW FILE: README --- --- NEW FILE: TODO --- - = Todo ? = In Progress + = Complete 0.0.1 - Move to 2.1 AAA Framework --- NEW FILE: autogen.sh --- #!/bin/sh # autogen.sh - generates configure using the autotools # $Id: autogen.sh,v 1.1 2004/02/08 22:57:09 firechipmunk Exp $ libtoolize --force --copy #libtoolize14 --force --copy aclocal autoheader touch NEWS automake --add-missing --copy rm NEWS autoconf rm -rf autom4te.cache --- NEW FILE: configure.in --- AC_INIT(src/mod_authn_cache.c) AM_INIT_AUTOMAKE(mod_authn_cache, 0.1.0) #AM_MAINTAINER_MODE AM_CONFIG_HEADER(include/mod_authn_cache_config.h:config.in) AC_PROG_CC AC_PROG_CPP AC_PROG_LD AC_PROG_INSTALL AM_PROG_LIBTOOL # check for --with-apxs AC_MSG_CHECKING(for --with-apxs) AC_ARG_WITH(apxs, [ --with-apxs=PATH Path to apxs], [ if test -x "$withval" then AC_MSG_RESULT([$withval executable, good]) APXS=$withval else echo AC_MSG_ERROR([$withval not found or not executable]) fi ], AC_MSG_RESULT(no)) # if no apxs found yet, check /usr/local/apache/sbin # since it's the default Apache location if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin) if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/local/apache2/bin) if test -x /usr/local/apache2/bin/apxs; then APXS=/usr/local/apache2/bin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/sbin) if test -x /usr/sbin/apxs; then APXS=/usr/sbin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi # last resort if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in your PATH) AC_PATH_PROG(APXS, apxs) if test -n "$APXS"; then AC_MSG_RESULT([found $APXS, we'll use this. Use --with-apxs to specify another.]) fi fi if test -z "$APXS"; then AC_MSG_ERROR([**** apxs was not found, DSO compilation will not be available.]) fi # determine LIBEXEC AC_MSG_CHECKING(for Apache libexec directory) LIBEXECDIR=`${APXS} -q LIBEXECDIR` AC_MSG_RESULT($LIBEXECDIR) # determine INCLUDES AC_MSG_CHECKING([for Apache include directory]) AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`" AC_MSG_RESULT($AP_INCLUDES) CFLAGS="$CFLAGS $AP_INCLUDES" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) fi PKG_PATH= AC_SUBST(LIBEXECDIR) AC_SUBST(AP_INCLUDES) AC_SUBST(CFLAGS) AC_OUTPUT(Makefile src/Makefile) echo "---" echo "Configuration summary for mod_authn_cache" echo "" echo " * Apache modules directory = $LIBEXECDIR" echo "" echo "---" echo "****" echo " If you have problems with libtool try this:" echo " export SED=sed" echo "****" |
From: <fir...@us...> - 2004-02-08 22:51:55
|
Update of /cvsroot/mod-auth/mod_authn_cache/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1505 Modified Files: mod_authn_cache.c Removed Files: mod_authn_cache.h Log Message: move it back to a framework Index: mod_authn_cache.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_cache/src/mod_authn_cache.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mod_authn_cache.c 6 Jan 2004 01:31:01 -0000 1.7 +++ mod_authn_cache.c 8 Feb 2004 22:48:48 -0000 1.8 @@ -1,353 +1,42 @@ /* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact ap...@ap.... + * Copyright 2003-2004 Paul Querna * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== + * http://www.apache.org/licenses/LICENSE-2.0 * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. */ /* * mod_authn_cache - * - * Paul Querna + * */ #include "apr_lib.h" #define APR_WANT_STRFUNC #include "apr_want.h" #include "apr_strings.h" -#include "apr_md5.h" -#include "apr_sha1.h" -#include "apr_reslist.h" -#include "apr_thread_mutex.h" -#include "apr_hash.h" -#include "apr_shm.h" - #include "ap_provider.h" + #include "httpd.h" #include "http_config.h" #include "http_core.h" #include "http_log.h" #include "http_protocol.h" #include "http_request.h" -#include "mod_auth.h" - -#include "util_md5.h" -#define DFLT_HOSTNAME "localhost" -#define DFLT_PORT (8008) -#define DFLT_CONN_MIN (10) -#define DFLT_CONN_SOFT (15) -#define DFLT_CONN_MAX (25) -#define DFLT_CONN_TTL (600) -#define DFLT_TIMEOUT (6) -#define DFLT_OPTIONS (0) - -static int mcd_conn_count = 0; -static apr_reslist_t *reslist_pool; +#include "mod_auth.h" module AP_MODULE_DECLARE_DATA authn_cache_module; -typedef struct mcd_rest_struct -{ - apr_sockaddr_t *sockaddr; - apr_socket_t *sock; - apr_bucket_alloc_t *bb_l; - apr_bucket_brigade *bb; - apr_pool_t* pool; - -} mcd_res_t; - - -static apr_status_t mcd_new_conn(void **resource, void *params, apr_pool_t * pool) -{ - apr_status_t rv = APR_SUCCESS; - mcd_res_t *mcdres; - apr_bucket *e; - - mcdres = apr_palloc(pool, sizeof(*mcdres)); - - rv = apr_sockaddr_info_get(&mcdres->sockaddr, DFLT_HOSTNAME, APR_UNSPEC, DFLT_PORT, 0, pool); - if (rv != APR_SUCCESS) { - ap_log_perror(APLOG_MARK, APLOG_ERR, rv, pool, "apr_sockaddr_info_get"); - return rv; - } - if (apr_socket_create_ex(&mcdres->sock, mcdres->sockaddr->family, SOCK_STREAM, 0, - pool) != APR_SUCCESS) { - ap_log_perror(APLOG_MARK, APLOG_ERR, rv, pool, "apr_socket_create"); - return rv; - } - - rv = apr_socket_timeout_set(mcdres->sock, DFLT_TIMEOUT); - if (rv != APR_SUCCESS) { - ap_log_perror(APLOG_MARK, APLOG_ERR, rv, pool, "apr_socket_timeout_set"); - return rv; - } - - rv = apr_socket_connect(mcdres->sock, mcdres->sockaddr); - if (rv != APR_SUCCESS) { - ap_log_perror(APLOG_MARK, APLOG_ERR, rv, pool, "apr_socket_connect"); - return rv; - } - - mcdres->bb_l = apr_bucket_alloc_create(pool); - mcdres->bb = apr_brigade_create(pool, mcdres->bb_l); - e = apr_bucket_socket_create(mcdres->sock, mcdres->bb_l); - APR_BRIGADE_INSERT_TAIL(mcdres->bb, e); - mcdres->pool = pool; - *resource = mcdres; - return rv; -} - -static apr_status_t mcd_kill_conn(void *resource, void *params, apr_pool_t * pool) -{ - apr_status_t rv = APR_SUCCESS; - mcd_res_t *mcd = resource; - - apr_brigade_destroy(mcd->bb); - apr_bucket_alloc_destroy(mcd->bb_l); - rv = apr_socket_close(mcd->sock); - - return rv; -} - -#define MIN_LINE_ALLOC 80 - -static apr_status_t ap_mcd_getline(char **s, apr_size_t n, - apr_size_t *read, apr_pool_t* pool, - mcd_res_t *mcd) -{ - apr_status_t rv; - apr_bucket *e; - apr_size_t bytes_handled = 0, current_alloc = 0; - char *pos, *last_char = *s; - int do_alloc = (*s == NULL), saw_eos = 0; - apr_bucket_alloc_t *bb_l; - apr_bucket_brigade *b; - - bb_l = apr_bucket_alloc_create(mcd->pool); - b = apr_brigade_create(mcd->pool, bb_l); - rv = apr_brigade_split_line(b, mcd->bb, APR_NONBLOCK_READ, n); - - /* Something horribly wrong happened. Someone didn't block! */ - if (APR_BRIGADE_EMPTY(b)) { - return APR_EGENERAL; - } - - for (;;) { - - APR_BRIGADE_FOREACH(e, b) { - const char *str; - apr_size_t len; - /* If we see an EOS, don't bother doing anything more. */ - if (APR_BUCKET_IS_EOS(e)) { - saw_eos = 1; - break; - } - - rv = apr_bucket_read(e, &str, &len, APR_NONBLOCK_READ); - - if (rv != APR_SUCCESS) { - return rv; - } - if (len == 0) { - /* no use attempting a zero-byte alloc (hurts when - * using --with-efence --enable-pool-debug) or - * doing any of the other logic either - */ - continue; - } - - /* Would this overrun our buffer? If so, we'll die. */ - if (n < bytes_handled + len) { - *read = bytes_handled; - return APR_ENOSPC; - } - /* Just copy the rest of the data to the end of the old buffer. */ - pos = *s + bytes_handled; - memcpy(pos, str, len); - last_char = pos + len - 1; - - /* We've now processed that new data - update accordingly. */ - bytes_handled += len; - } - - /* If we got a full line of input, stop reading */ - if (last_char && (*last_char == APR_ASCII_LF)) { - break; - } - } - - /* We now go backwards over any CR (if present) or white spaces. - * - * Trim any extra trailing spaces or tabs except for the first - * space or tab at the beginning of a blank string. This makes - * it much easier to check field values for exact matches, and - * saves memory as well. Terminate string at end of line. - */ - pos = last_char; - if (pos > *s && *(pos - 1) == APR_ASCII_CR) { - --pos; - } - - /* Trim any extra trailing spaces or tabs except for the first - * space or tab at the beginning of a blank string. This makes - * it much easier to check field values for exact matches, and - * saves memory as well. - */ - while (pos > ((*s) + 1) - && (*(pos - 1) == APR_ASCII_BLANK || *(pos - 1) == APR_ASCII_TAB)) { - --pos; - } - - /* Since we want to remove the LF from the line, we'll go ahead - * and set this last character to be the term NULL and reset - * bytes_handled accordingly. - */ - *pos = '\0'; - last_char = pos; - bytes_handled = pos - *s; - *read = bytes_handled; - - apr_brigade_destroy(b); - apr_bucket_alloc_destroy(bb_l); - return APR_SUCCESS; -} - -#define LINELEN 512 -static apr_status_t mcd_get(request_rec * r, mcd_res_t* mcd, const char* key, char** value) { - apr_status_t rv = APR_SUCCESS; - apr_size_t sendlen; - apr_size_t recvlen; - apr_bucket *e; - char *command = NULL; - char *cmd; - char *vlen; - int i; - - command = apr_psprintf(mcd->pool, "get %s\r\n", key); - sendlen = strlen(command); - - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: send line: '%s'", command); - rv = apr_socket_send(mcd->sock, command, &sendlen); - - if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: apr_socket_send"); - return rv; - } - - command = apr_palloc(r->pool, LINELEN); - for(i=0;i<10;) { // prevent runways - memset(command, 0, LINELEN); - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: watiing for line'"); - ap_mcd_getline(&command, LINELEN, &recvlen, r->pool, mcd); - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: got line: '%s'", command); - - if(strcmp("END", command) == 0) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: got END."); - break; - } - - if(strlen(command) == 0) { - i++; - } - - cmd = ap_getword_white_nc(r->pool, &command); - if(strcmp("VALUE", cmd) == 0) { - //foo 600 5 - cmd = ap_getword_white_nc(r->pool, &command); - cmd = ap_getword_white_nc(r->pool, &command); - vlen = ap_getword_white_nc(r->pool, &command); - recvlen = apr_strtoi64(vlen, NULL, 10); - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: Looking for Value of Len: '%d'", recvlen); -/* for (;;) { - const char *str; - apr_size_t len; - APR_BRIGADE_FOREACH(e, mcd->bb) { - rv = apr_bucket_read(e, &str, &len, APR_BLOCK_READ); - if (rv != APR_SUCCESS) { - return rv; - } - } - } - */ - //break; - } - } - - - return rv; -} - -static apr_status_t mcd_set(request_rec * r, mcd_res_t* mcd, const char* key) { - apr_status_t rv = APR_SUCCESS; - apr_size_t sendlen; - char *command; - - command = apr_psprintf(r->pool, "set %s\r\n", key); - sendlen = strlen(command); - - rv = apr_socket_send(mcd->sock, command, &sendlen); - if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "mcd_get: apr_socket_send"); - return rv; - } - //getLine(r, mcd, &command, 5000); - - return rv; -} - - typedef struct authn_cache_conf_t { authn_provider_list *providers; } authn_cache_conf_t; @@ -442,10 +131,6 @@ current_provider = conf->providers; -// apr_reslist_acquire(reslist_pool, (void **) &mcd); - mcd_new_conn((void**)&mcd, NULL, r->pool); - mcd_get(r, mcd, "foo", &foo); - mcd_kill_conn((void*) mcd, NULL, r->pool); do { const authn_provider *provider; if (!current_provider) { @@ -486,11 +171,8 @@ } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "NOT adding user(but auth good?): %s to cache for realm: %s!",user,ap_auth_name(r)); - } - // apr_reslist_release(reslist_pool, (void **) mcd); + } return auth_result; } @@ -501,12 +183,6 @@ return AUTH_USER_NOT_FOUND; } -static apr_status_t kill_mcd(void *p) -{ - apr_status_t rv = APR_SUCCESS; - apr_reslist_destroy(reslist_pool); - return rv; -} static int init_authn_cache(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) @@ -514,7 +190,7 @@ apr_status_t rv; void *data; - const char *userdata_key = "mod_authn_dbi_init"; + const char *userdata_key = "mod_authn_cache_init"; apr_pool_userdata_get(&data, userdata_key, s->process->pool); @@ -524,17 +200,7 @@ return OK; } - // apr_reslist_create(&reslist_pool, DFLT_CONN_MIN, /* hard minimum */ - // DFLT_CONN_SOFT, /* soft maximum */ - // DFLT_CONN_MAX, /* hard maximum */ - // DFLT_CONN_TTL, /* Time to live -- mcd server might override/disconnect! */ - // mcd_new_conn, /* Make a New Connection */ - // mcd_kill_conn, /* Kill Old Connection */ - // (void *) NULL, p); - -// apr_pool_cleanup_register(p, p, kill_mcd, apr_pool_cleanup_null); - - ap_add_version_component(p, "mod_authn_cache_mcd/0.1"); + ap_add_version_component(p, "mod_authn_cache/0.1"); return 0; } --- mod_authn_cache.h DELETED --- |
From: <fir...@us...> - 2004-02-08 22:44:26
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32512 Modified Files: ChangeLog TODO configure.in Log Message: removed DBI_NOT_THREAD_SAFE. fixed sha1 support. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 8 Feb 2004 21:47:23 -0000 1.8 +++ ChangeLog 8 Feb 2004 22:41:12 -0000 1.9 @@ -1,4 +1,10 @@ -------------------------------------------------------------------------------------------------------- +08.02.2004 15:44 (MST), firechipmunk + - Removed DBI_NOT_THREAD_SAFE + - Fixed SHA1 Support + + +-------------------------------------------------------------------------------------------------------- 08.02.2004 14:50 (MST), firechipmunk - Removed 'native' SHA1 Support. This is now included in apr-util. Index: TODO =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TODO 8 Feb 2004 03:11:09 -0000 1.5 +++ TODO 8 Feb 2004 22:41:12 -0000 1.6 @@ -33,6 +33,7 @@ - AMD64? - Linux MIPS [chip] - PPC? + - Support mod_dbi_pool [chip?] 0.9.0 - Include HTML/XML Documentation in Releases? @@ -43,7 +44,6 @@ - Create "security-issues" contact address (for whole auth project?) - Mangle usernames [axel] - More SQL Variables [axel] - - Support mod_dbi_pool [chip?] - Send Announcements: - SourceForge - FreshMeat [chip] Index: configure.in =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configure.in 8 Feb 2004 04:02:03 -0000 1.5 +++ configure.in 8 Feb 2004 22:41:12 -0000 1.6 @@ -10,9 +10,6 @@ AC_PROG_INSTALL AM_PROG_LIBTOOL -# XXXX: Write an option for this. -DBI_NOT_THREAD_SAFE=1 - AC_MSG_CHECKING(for --with-dbi) AC_ARG_WITH(dbi, [ --with-dbi=PATH Path to dbi], [ @@ -165,7 +162,7 @@ AC_MSG_CHECKING([for Apache include directory]) AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`" AC_MSG_RESULT($AP_INCLUDES) -CFLAGS="${CFLAGS} $AP_INCLUDES -DDBI_NOT_THREAD_SAFE=${DBI_NOT_THREAD_SAFE}" +CFLAGS="${CFLAGS} $AP_INCLUDES" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then |
From: <fir...@us...> - 2004-02-08 22:44:26
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32512/src Modified Files: mod_authn_dbi.c Log Message: removed DBI_NOT_THREAD_SAFE. fixed sha1 support. Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mod_authn_dbi.c 8 Feb 2004 21:47:23 -0000 1.15 +++ mod_authn_dbi.c 8 Feb 2004 22:41:12 -0000 1.16 @@ -25,7 +25,6 @@ #include "../include/mod_authn_dbi_config.h" -#define AUTHN_DBI_CVS_ID "$Id$" #define MOD_AUTHN_DBI_VERSION VERSION #include "apr_lib.h" @@ -35,7 +34,6 @@ #include "apr_md5.h" /* for apr_password_validate */ #include "apr_sha1.h" #include "apr_reslist.h" -#include "apr_thread_mutex.h" /* to block MySQL on dbi_connect */ #include "apr_hash.h" #include "ap_provider.h" @@ -51,14 +49,6 @@ #include <dbi/dbi.h> -#ifndef DBI_NOT_THREAD_SAFE -#define DBI_NOT_THREAD_SAFE (1) -#endif - -#if DBI_NOT_THREAD_SAFE -static apr_thread_mutex_t *dbi_lock = NULL; -#endif - #define DFLT_DBI_NAME "AuthDB" #define DFLT_DBI_HOST "localhost" #define DFLT_DBI_DRIVER "mysql" @@ -128,6 +118,7 @@ CONF_DBI_CONN_TTL, CONF_DBI_OPTIONS }; + typedef struct dbi_dconfig { const char *id; @@ -192,15 +183,14 @@ dbi_conn_count++; if (DBI_HARD_MAX_CONNS > dbi_conn_count) { - ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, r, - "[mod_authn_dbi.c] Creating New DBI Server Connection"); + myres = apr_palloc(r, sizeof(*myres)); myres->conn = dbi_conn_new(driver); if (myres->conn == NULL) { ap_log_perror(APLOG_MARK, APLOG_EMERG, 0, r, "[mod_authn_dbi.c] DBI Connection Failed. dbi_conn_new returned NULL. Insufficient memory or invalid DBD?"); - rv = !APR_SUCCESS; + rv = APR_EGENERAL; /* * modules/ssl/ssl_engine_log.c:103 * said this was okay. so i do it. @@ -212,28 +202,19 @@ dbi_conn_set_option(myres->conn, "username", user); dbi_conn_set_option(myres->conn, "password", pwd); dbi_conn_set_option(myres->conn, "dbname", name); -#if DBI_NOT_THREAD_SAFE - if (strcmp(driver, "mysql") == 0) { - apr_thread_mutex_lock(dbi_lock); - } -#endif + if (dbi_conn_connect(myres->conn) != 0) { err_num = dbi_conn_error(myres->conn, &err_str); /* Connetion Failed */ ap_log_perror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_authn_dbi.c] DBI Connection to %s://%s@%s/%s Failed. Error: (%d) %s", driver, user, host, name, err_num, err_str); - rv = !APR_SUCCESS; + rv = APR_EGENERAL; } else { ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, r, "[mod_authn_dbi.c] Connection was created sucessfully"); } -#if DBI_NOT_THREAD_SAFE - if (strcmp(driver, "mysql") == 0) { - apr_thread_mutex_unlock(dbi_lock); - } -#endif } *resource = myres; } @@ -244,7 +225,7 @@ DBI_HARD_MAX_CONNS); /* we didn't create a new connection! */ dbi_conn_count--; - rv = !APR_SUCCESS; + rv = APR_EGENERAL; } return rv; } @@ -253,8 +234,7 @@ apr_pool_t * pool) { dbi_rest *res = resource; - ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, pool, - "[mod_authn_dbi.c] Disconnecting from Server"); + dbi_conn_close(res->conn); dbi_conn_count--; @@ -802,9 +782,6 @@ } else { /* XXX: what about portability!? are any special precautions needed for win32/netware/ebdic ? */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "Password format is %d", - (int) conf->rec.password_format); switch (conf->rec.password_format) { case plain: @@ -830,7 +807,7 @@ */ #ifndef SKIP_APR_PWCHECK - /* Define SKIP_APR_PWCHECK to disable this check if apr-util supports new algorithms we don't yet + /* Define SKIP_APR_PWCHECK to disable this check if apr-util supports new algorithms we don't yetSKIP_APR_PWCHECK * know about. Should be used as a workaround only since it might open the door to DoS attacks if specially * crafted entries are passed to apr_password_validate. */ @@ -839,8 +816,10 @@ c = strlen(dbi_pass); /* we do some checks to keep libc from making wrong assumptions and ourselves from segfaulting */ - if (!((c == 13) && (apr_isalnum(dbi_pass[0]) || (dbi_pass[0] == '.') || (dbi_pass[0] == '.')) && (apr_isalnum(dbi_pass[1]) || (dbi_pass[1] == '.') || (dbi_pass[1] == '.'))) && /* crypt */ - !((c == 37))) { /* not much to be done for md5, apr-util is old enough to look after itself */ + if (!((c == 13) && (apr_isalnum(dbi_pass[0]) || (dbi_pass[0] == '.') || (dbi_pass[0] == '.')) + && (apr_isalnum(dbi_pass[1]) || (dbi_pass[1] == '.') || (dbi_pass[1] == '.'))) && /* crypt */ + !((c == 37)) && /* not much to be done for md5, apr-util is old enough to look after itself */ + (0 != strncmp(dbi_pass, APR_SHA1PW_ID, strlen(APR_SHA1PW_ID)))) { /* sha1 */ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "[mod_authn_dbi.c] Invalid Apr-format entry or unsupported format in password field of user %s in config %s", user, conf->rec.dbi_name); @@ -994,9 +973,6 @@ realm, ":", dbi_pass, NULL)); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "[mod_authn_dbi.c] Query Good. Returning Hash: MD5( %s:%s:%s ) = %s", - user, realm, dbi_pass, dbi_hash); *rethash = dbi_hash; ARV = AUTH_USER_FOUND; break; @@ -1009,8 +985,8 @@ ARV = AUTH_GENERAL_ERROR; } else { - ARV = AUTH_USER_FOUND; *rethash = apr_pstrdup(r->pool, dbi_pass); + ARV = AUTH_USER_FOUND; } break; default: @@ -1075,9 +1051,6 @@ } dbi_shutdown(); -#if DBI_NOT_THREAD_SAFE - rv = apr_thread_mutex_destroy(dbi_lock); -#endif return rv; } @@ -1104,17 +1077,6 @@ } ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, "[mod_authn_dbi.c] Running DBI init Code"); -#if DBI_NOT_THREAD_SAFE - rv = apr_thread_mutex_create(&dbi_lock, APR_LOCK_DEFAULT, p); - ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, - "[mod_authn_dbi.c] DBI is running in Non-Thread Safe Mode"); - if (rv != APR_SUCCESS) { - ap_log_perror(APLOG_MARK, APLOG_EMERG, 0, p, - "[mod_authn_dbi.c] - Failed Creating DBI thread Mutex! apr_thread_mutex_create returned: \"%d\" ", - rv); - return rv; - } -#endif if ((rval = dbi_initialize(dbi_global_config.driverdir)) > 0) { if (dbi_global_config.driverdir == NULL) { ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p, @@ -1145,7 +1107,7 @@ "[mod_authn_dbi.c] - Initlialization of libdbi with AuthnDbiDriverDir %s failed", dbi_global_config.driverdir); } - return !APR_SUCCESS; + return APR_EDSOOPEN; } /* loop the hashed config stuff... */ @@ -1180,9 +1142,9 @@ module AP_MODULE_DECLARE_DATA authn_dbi_module = { STANDARD20_MODULE_STUFF, create_authn_dbi_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config creator */ - NULL, /* merge server config */ - authn_dbi_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* dir merger --- default is to override */ + NULL, /* server config creator */ + NULL, /* merge server config */ + authn_dbi_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; |
From: <fir...@us...> - 2004-02-08 22:05:27
|
Update of /cvsroot/mod-auth/mod_dbi_pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242 Added Files: .cvsignore Log Message: forgot to add my cvsignore stuff --- NEW FILE: .cvsignore --- Makefile Makefile.in aclocal.m4 autom4te.cache compile config.guess config.in config.log config.status config.sub configure depcomp install-sh libtool ltmain.sh missing mkinstalldirs stamp-h.in |
From: <fir...@us...> - 2004-02-08 22:05:27
|
Update of /cvsroot/mod-auth/mod_dbi_pool/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/src Added Files: .cvsignore Log Message: forgot to add my cvsignore stuff --- NEW FILE: .cvsignore --- .deps .libs Makefile Makefile.in *.la *.lo |
From: <fir...@us...> - 2004-02-08 22:05:27
|
Update of /cvsroot/mod-auth/mod_dbi_pool/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/include Added Files: .cvsignore Log Message: forgot to add my cvsignore stuff --- NEW FILE: .cvsignore --- mod_authn_dbi_config.h stamp-h1 |
From: <fir...@us...> - 2004-02-08 22:04:45
|
Update of /cvsroot/mod-auth/mod_dbi_pool/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24129/include Log Message: Directory /cvsroot/mod-auth/mod_dbi_pool/include added to the repository |
From: <fir...@us...> - 2004-02-08 22:03:37
|
Update of /cvsroot/mod-auth/mod_dbi_pool/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23744/src Modified Files: mod_dbi_pool.c Added Files: Makefile.am Log Message: get this project going. added auto* crap. --- NEW FILE: Makefile.am --- CLEANFILES = .libs/libmod_dbi_pool *~ libmod_dbi_pool_la_SOURCES = mod_dbi_pool.c libmod_dbi_pool_la_CFLAGS = -I$(DBI_INCLUDES) libmod_dbi_pool_la_LDFLAGS = -L$(DBI_LIB) -ldbi lib_LTLIBRARIES = libmod_dbi_pool.la make_so: @if test ! -L mod_dbi_pool.so ; then ln -s .libs/libmod_dbi_pool.so mod_dbi_pool.so ; fi install: make_so @${APXS} -i -a -n dbi_pool mod_dbi_pool.so @echo "" @echo "" @echo "***********************************************" @echo "" @echo " Please read the documentation at " @echo " http://mod-auth.sourceforge.net/docs/ for " @echo " details on configuration of this module " @echo "" @echo "***********************************************" @echo "" Index: mod_dbi_pool.c =================================================================== RCS file: /cvsroot/mod-auth/mod_dbi_pool/src/mod_dbi_pool.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mod_dbi_pool.c 3 Jan 2004 00:31:25 -0000 1.2 +++ mod_dbi_pool.c 8 Feb 2004 22:00:18 -0000 1.3 @@ -204,7 +204,7 @@ err_num = dbi_conn_error(*db, &err_str); /* Connetion Failed */ ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, pool, - "[mod_authn_dbi.c] DBI Connection to %s://%s@%s/%s Failed. Error: (%d) %s", + "[mod_dbi_pool.c] DBI Connection to %s://%s@%s/%s Failed. Error: (%d) %s", svr->dbi_driver, svr->user, svr->host, svr->db, err_num, err_str); return APR_EGENERAL; |
From: <fir...@us...> - 2004-02-08 22:03:27
|
Update of /cvsroot/mod-auth/mod_dbi_pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23744 Added Files: Makefile.am autogen.sh configure.in udcl.sh Log Message: get this project going. added auto* crap. --- NEW FILE: Makefile.am --- EXTRA_DIST = SUBDIRS = src --- NEW FILE: autogen.sh --- #!/bin/sh # autogen.sh - generates configure using the autotools # $Id: autogen.sh,v 1.1 2004/02/08 22:00:18 firechipmunk Exp $ libtoolize --force --copy #libtoolize14 --force --copy aclocal autoheader touch NEWS automake --add-missing --copy rm NEWS autoconf rm -rf autom4te.cache --- NEW FILE: configure.in --- AC_INIT(src/mod_dbi_pool.c) AM_MAINTAINER_MODE AM_INIT_AUTOMAKE(mod_dbi_pool, 0.1.0) AM_CONFIG_HEADER(include/mod_dbi_pool_config.h:config.in) AC_PROG_CC AC_PROG_CPP AC_PROG_LD AC_PROG_INSTALL AM_PROG_LIBTOOL AC_MSG_CHECKING(for --with-dbi) AC_ARG_WITH(dbi, [ --with-dbi=PATH Path to dbi], [ if test -e "$withval/include/dbi/dbi.h" then DBI_INCLUDES=$withval/include DBI_LIB=$withval/lib AC_MSG_RESULT([found dbi.h]) else echo AC_MSG_ERROR([$withval/include/dbi/dbi.h not found ]) fi ], AC_MSG_RESULT(no)) AC_MSG_CHECKING(for --with-dbi-include) AC_ARG_WITH(dbi-include, [ --with-dbi-include=PATH Path to dbi headers], [ if test -e "$withval/dbi/dbi.h" then DBI_INCLUDES=$withval AC_MSG_RESULT([found dbi.h]) else echo AC_MSG_ERROR([$withval/dbi/dbi.h not found ]) fi ], AC_MSG_RESULT(no)) AC_MSG_CHECKING(for --with-dbi-libs) AC_ARG_WITH(dbi-libs, [ --with-dbi-libs=PATH Path to dbi libs], [ if test -e "$withval/libdbi.so" then DBI_LIB=$withval AC_MSG_RESULT([found libdbi.so]) else echo AC_MSG_ERROR([$withval/libdbi.so not found ]) fi ], AC_MSG_RESULT(no)) if test -z "$DBI_LIB"; then AC_MSG_CHECKING(for dbi-libs in /usr/lib) if test -e /usr/lib/libdbi.so; then DBI_LIB=/usr/lib AC_MSG_RESULT([found libdbi.so, we'll use this. Use --with-dbi-libs to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$DBI_INCLUDES"; then AC_MSG_CHECKING(for dbi-include in /usr/include) if test -e /usr/include/dbi/dbi.h; then DBI_INCLUDES=/usr/include AC_MSG_RESULT([found dbi/dbi.h, we'll use this. Use --with-dbi-include to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$DBI_LIB"; then AC_MSG_CHECKING(for dbi-libs in /usr/local/lib) if test -e /usr/local/lib/libdbi.so; then DBI_LIB=/usr/local/lib AC_MSG_RESULT([found libdbi.so, we'll use this. Use --with-dbi-libs to specify another.]) else AC_MSG_ERROR([please set --with-dbi-libs=PATH or --with-dbi=PATH to your dbi install]) fi fi if test -z "$DBI_INCLUDES"; then AC_MSG_CHECKING(for dbi-include in /usr/local/include) if test -e /usr/local/include/dbi/dbi.h; then DBI_INCLUDES=/usr/local/include AC_MSG_RESULT([found dbi/dbi.h, we'll use this. Use --with-dbi-include to specify another.]) else AC_MSG_ERROR([please set --with-dbi-include=PATH or --with-dbi=PATH to your dbi install]) fi fi # check for --with-apxs AC_MSG_CHECKING(for --with-apxs) AC_ARG_WITH(apxs, [ --with-apxs=PATH Path to apxs], [ if test -x "$withval" then AC_MSG_RESULT([$withval executable, good]) APXS=$withval else echo AC_MSG_ERROR([$withval not found or not executable]) fi ], AC_MSG_RESULT(no)) # if no apxs found yet, check /usr/local/apache/sbin # since it's the default Apache location if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin) if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/local/apache2/bin) if test -x /usr/local/apache2/bin/apxs; then APXS=/usr/local/apache2/bin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in /usr/sbin) if test -x /usr/sbin/apxs; then APXS=/usr/sbin/apxs AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi fi # last resort if test -z "$APXS"; then AC_MSG_CHECKING(for apxs in your PATH) AC_PATH_PROG(APXS, apxs) if test -n "$APXS"; then AC_MSG_RESULT([found $APXS, we'll use this. Use --with-apxs to specify another.]) fi fi if test -z "$APXS"; then AC_MSG_ERROR([**** apxs was not found, DSO compilation will not be available.]) fi # determine LIBEXEC AC_MSG_CHECKING(for Apache libexec directory) LIBEXECDIR=`${APXS} -q LIBEXECDIR` AC_MSG_RESULT($LIBEXECDIR) # determine INCLUDES AC_MSG_CHECKING([for Apache include directory]) AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`" AC_MSG_RESULT($AP_INCLUDES) CFLAGS="${CFLAGS} $AP_INCLUDES" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) fi PKG_PATH= AC_SUBST(LIBEXECDIR) AC_SUBST(AP_INCLUDES) AC_SUBST(DBI_INCLUDES) AC_SUBST(DBI_LIB) AC_SUBST(CFLAGS) AC_SUBST(APXS) AC_OUTPUT(Makefile src/Makefile) echo "---" echo "Configuration summary for mod_dbi_pool" echo "" echo " * Apache modules directory = $LIBEXECDIR" echo " * libdbi include directory = $DBI_INCLUDES" echo " * libdbi libs = $DBI_LIB" echo "" echo "---" echo "****" echo " If you have problems with libtool try this:" echo " export SED=sed" echo "****" --- NEW FILE: udcl.sh --- #!/bin/sh # define $EDITOR and EDITOR_FLAGS in your environment to customize this CL="ChangeLog" DSTR=`date +%d.%m.%Y` DSTR2=`date +%H:%M\ \(%Z\)` TF="ferite-changelog-entry-"$USER if test -z $EDITOR; then EDITOR="nano" EDITOR_FLAGS="+" fi export UNAME=$USER; if test $USER="chip"; then export UNAME="firechipmunk" fi echo "--------------------------------------------------------------------------------------------------------" > $TF echo "$DSTR $DSTR2, $UNAME" >> $TF echo >> $TF echo >> $TF $EDITOR $EDITOR_FLAGS $TF echo "" >> $TF cat $CL >> $TF rm $CL if test -f $TF"~"; then rm $TF"~" fi mv $TF $CL |
From: <fir...@us...> - 2004-02-08 21:55:19
|
Update of /cvsroot/mod-auth/mod_auth_webspace/htdocs/docs/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22017/docs/mod_authn_dbi Modified Files: index.xml Log Message: updated docs with the removal of 'native' SHA1 Support. Index: index.xml =================================================================== RCS file: /cvsroot/mod-auth/mod_auth_webspace/htdocs/docs/mod_authn_dbi/index.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- index.xml 28 Dec 2003 23:21:48 -0000 1.11 +++ index.xml 8 Feb 2004 21:52:13 -0000 1.12 @@ -605,7 +605,7 @@ <name>AuthnDbiPasswordFormat</name> <description>The format the password is saved as</description> <syntax>AuthnDbiPasswordFormat <var>DbiConfigName</var> - <var>Plain|Apr|AprSHA1|AprDigest</var></syntax> + <var>Plain|Apr|AprDigest</var></syntax> <default><code>plain</code></default> <contextlist> <context>server config</context> @@ -631,7 +631,7 @@ project and comes bundled with the releases of the Apache server. - At the moment these are MD5 on Unix, + At the moment these are SHA1 and MD5 on Unix, Windows and other platforms. And crypt on Unix only. The formats are exactly the same as are used @@ -642,22 +642,14 @@ <br /><br /> An example password in md5 format: <code>$apr1$SvzPV/..$CJl3oQ/ko4Tq5eg6L2Fk..</code><br /><br /> + An example password in SHA1 format: + <code>sha1:{SHA}C+7Hteo/D9vJXQ3UfzxbwnXaijM=</code><br /><br /> Just specify "Apr" as the AuthnDbiPasswordFormat, - not crypt or md5. The format is detected automatically. Entries of + not crypt, sha1 or md5. The format is detected automatically. Entries of both formats may be mixed within the same table. </p> </li> - <li><code>AprSHA1</code> (this option will disappear very soon when libapr-util also handles SHA1 in <code>apr_password_validate()</code>, just use <code>Apr</code> then) - <p> - Passwords are in the SHA1 format of libapr-util, - again like they are used by <code>htpasswd</code>. - <br /><br /> - An example password in SHA1 format: - <code>sha1:{SHA}C+7Hteo/D9vJXQ3UfzxbwnXaijM=</code> - <br /><br /> - </p> - </li> <li><code>AprDigest</code> <p> The Passwords are in Digest MD5-like format, like |
From: <fir...@us...> - 2004-02-08 21:50:43
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21133/src Modified Files: mod_authn_dbi.c Log Message: Removed 'native' SHA1 Support. This is now included in apr-util. Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mod_authn_dbi.c 8 Feb 2004 06:12:31 -0000 1.14 +++ mod_authn_dbi.c 8 Feb 2004 21:47:23 -0000 1.15 @@ -21,8 +21,6 @@ * Paul Querna * Axel Grossklaus * - * based on mod_authn_mysql - * */ #include "../include/mod_authn_dbi_config.h" @@ -95,8 +93,7 @@ typedef enum pw_format_enum { plain, - apr, /* handles crypt & md5 through apr_password_validate() */ - aprsha1, + apr, /* handles crypt, sha1 & md5 through apr_password_validate() */ aprdig /* * Possible other formats to consider: @@ -523,9 +520,6 @@ else if (!strcasecmp(value, "Apr")) { temp->rec.password_format = apr; } - else if (!strcasecmp(value, "AprSHA1")) { - temp->rec.password_format = aprsha1; - } else if (!strcasecmp(value, "AprDigest")) { temp->rec.password_format = aprdig; } @@ -645,7 +639,7 @@ AP_INIT_TAKE2("AuthnDbiPasswordFormat", set_dbi_switch_conf, (void *) CONF_DBI_PASSWORD_FORMAT, RSRC_CONF, - "The format the password is saved as (Plain, Apr, AprSHA1 or AprDigest)"), + "The format the password is saved as (Plain, Apr, or AprDigest)"), AP_INIT_TAKE2("AuthnDbiIsActiveField", set_dbi_switch_conf, (void *) CONF_DBI_IS_ACTIVE_FIELD, RSRC_CONF, @@ -825,13 +819,14 @@ case apr: /* * This handles the password through the aprutil library. - * At the moment, the supported formats are crypt (on *nix only) and MD5. + * At the moment, the supported formats are crypt (on *nix only), SHA1 and MD5. * Other formats will transparently be supported as they become * available in libaprutil. * * Examples are: * crypt O8D24p2LCO7PA * md5 $apr1$SvzPV/..$CJl3oQ/ko4Tq5eg6L2Fk.. + * sha1 {SHA}C+7Hteo/D9vJXQ3UfzxbwnXaijM= */ #ifndef SKIP_APR_PWCHECK @@ -870,28 +865,6 @@ } break; - case aprsha1: - /* sha1:{SHA}C+7Hteo/D9vJXQ3UfzxbwnXaijM= */ - - if (strlen(dbi_pass) == 38) { - apr_sha1_base64(password, strlen(password), - crypt_pass); - if (strcmp(dbi_pass, crypt_pass) != 0) { - ARV = AUTH_DENIED; - } - else { - ARV = AUTH_GRANTED; - } - } - else { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, - "[mod_authn_dbi.c] Invalid SHA1-format entry in password field of user %s in config %s. Length is %d", - user, conf->rec.dbi_name, - strlen(dbi_pass)); - ARV = AUTH_GENERAL_ERROR; - } - break; - case aprdig: ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_authn_dbi.c] - AprDig format is not supported for Basic Authentication."); |
From: <fir...@us...> - 2004-02-08 21:50:43
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21133 Modified Files: ChangeLog Log Message: Removed 'native' SHA1 Support. This is now included in apr-util. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 8 Feb 2004 06:12:31 -0000 1.7 +++ ChangeLog 8 Feb 2004 21:47:23 -0000 1.8 @@ -1,4 +1,9 @@ -------------------------------------------------------------------------------------------------------- +08.02.2004 14:50 (MST), firechipmunk + - Removed 'native' SHA1 Support. This is now included in apr-util. + + +-------------------------------------------------------------------------------------------------------- 07.02.2004 23:12 (MST), firechipmunk - [SECURITY] Possible Problem with a formated Query String that is exactly MAX_STRING_LEN. - Fixed several return codes. |
From: <fir...@us...> - 2004-02-08 21:37:01
|
Update of /cvsroot/mod-auth/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18593 Modified Files: loginfo Log Message: use unified diffs on commit emails Index: loginfo =================================================================== RCS file: /cvsroot/mod-auth/CVSROOT/loginfo,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** loginfo 10 Nov 2003 20:34:45 -0000 1.3 --- loginfo 8 Feb 2004 21:33:52 -0000 1.4 *************** *** 25,28 **** # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog ! DEFAULT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail %{sVv} mod...@li... --- 25,28 ---- # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog ! DEFAULT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -u %{sVv} mod...@li... |
From: <fir...@us...> - 2004-02-08 06:15:31
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1143 Modified Files: AUTHORS ChangeLog Log Message: several fixes spotted by Brice Tebbs (again!) Index: AUTHORS =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AUTHORS 27 Oct 2003 04:22:26 -0000 1.2 --- AUTHORS 8 Feb 2004 06:12:31 -0000 1.3 *************** *** 1,3 **** ! Paul Querna ! Rob Emanuele ! Axel Grossklaus --- 1,8 ---- ! ! Core Coding: ! Paul Querna ! Axel Grossklaus ! ! Various Bug Fixes: ! Rob Emanuele ! Brice Tebbs Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog 8 Feb 2004 05:55:05 -0000 1.6 --- ChangeLog 8 Feb 2004 06:12:31 -0000 1.7 *************** *** 1,3 **** --- 1,9 ---- -------------------------------------------------------------------------------------------------------- + 07.02.2004 23:12 (MST), firechipmunk + - [SECURITY] Possible Problem with a formated Query String that is exactly MAX_STRING_LEN. + - Fixed several return codes. + + + -------------------------------------------------------------------------------------------------------- 07.02.2004 22:57 (MST), firechipmunk - Removed create_authn_dbi_config(...) since it is not used. |
From: <fir...@us...> - 2004-02-08 06:15:31
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1143/src Modified Files: mod_authn_dbi.c Log Message: several fixes spotted by Brice Tebbs (again!) Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mod_authn_dbi.c 8 Feb 2004 05:55:05 -0000 1.13 --- mod_authn_dbi.c 8 Feb 2004 06:12:31 -0000 1.14 *************** *** 451,455 **** } written += strlen(p); ! if (written >= MAX_STRING_LEN) { ap_log_perror(APLOG_MARK, APLOG_ERR, 0, r->pool, "[mod_authn_dbi.c] Populated string would exceed %d bytes", --- 451,455 ---- } written += strlen(p); ! if (written >= MAX_STRING_LEN-1) { ap_log_perror(APLOG_MARK, APLOG_ERR, 0, r->pool, "[mod_authn_dbi.c] Populated string would exceed %d bytes", *************** *** 749,753 **** "[mod_authn_dbi.c] - Server Config for \"%s\" was not found", dconf->id); ! return ARV; } --- 749,753 ---- "[mod_authn_dbi.c] - Server Config for \"%s\" was not found", dconf->id); ! return AUTH_GENERAL_ERROR; } *************** *** 802,809 **** && !strcmp(dbi_pass, DBI_EMPTY_PASSWORD)) { /* This user is configured to be allowed to login without a password (or any other password) */ - ARV = AUTH_GRANTED; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Accepting user %s without password check.", user); } else { --- 802,809 ---- && !strcmp(dbi_pass, DBI_EMPTY_PASSWORD)) { /* This user is configured to be allowed to login without a password (or any other password) */ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Accepting user %s without password check.", user); + ARV = AUTH_GRANTED; } else { *************** *** 949,953 **** "[mod_authn_dbi.c] - Server Config for \"%s\" was not found", dconf->id); ! return ARV; } --- 949,953 ---- "[mod_authn_dbi.c] - Server Config for \"%s\" was not found", dconf->id); ! return AUTH_GENERAL_ERROR; } *************** *** 956,960 **** ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_authn_dbi.c] - Digest Authentication with AuthnDbiPasswordFormat other than 'Plain' or 'AprDigest' is only supported on quantum computers"); ! return AUTH_DENIED; } --- 956,960 ---- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_authn_dbi.c] - Digest Authentication with AuthnDbiPasswordFormat other than 'Plain' or 'AprDigest' is only supported on quantum computers"); ! return AUTH_GENERAL_ERROR; } *************** *** 1007,1014 **** else if ((conf->rec.options & DBI_OPTION_EMPTY_PASSWORDS) && !strcmp(dbi_pass, DBI_EMPTY_PASSWORD)) { - ARV = AUTH_GRANTED; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Accepting user %s without password check.", user); } else { --- 1007,1014 ---- else if ((conf->rec.options & DBI_OPTION_EMPTY_PASSWORDS) && !strcmp(dbi_pass, DBI_EMPTY_PASSWORD)) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Accepting user %s without password check.", user); + ARV = AUTH_GRANTED; } else { *************** *** 1044,1047 **** --- 1044,1048 ---- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "[mod_authn_dbi.c] Unsupported password format in digest authentication. This is an internal error of mod_authn_dbi"); + ARV = AUTH_GENERAL_ERROR; } } *************** *** 1063,1066 **** --- 1064,1068 ---- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "[mod_authn_dbi.c] Query Failed!"); + ARV = AUTH_GENERAL_ERROR; } if (dbi_pass != NULL) { |
From: <fir...@us...> - 2004-02-08 05:58:04
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31438/src Modified Files: mod_authn_dbi.c Log Message: fixed small things. Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mod_authn_dbi.c 8 Feb 2004 04:02:03 -0000 1.12 --- mod_authn_dbi.c 8 Feb 2004 05:55:05 -0000 1.13 *************** *** 256,260 **** apr_pool_t * pool) { - /* dbi_config_rec *conf = params; */ dbi_rest *res = resource; ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, pool, --- 256,259 ---- *************** *** 354,358 **** do { written += (s - querystring); ! if (written >= MAX_STRING_LEN) { ap_log_perror(APLOG_MARK, APLOG_ERR, 0, r->pool, "[mod_authn_dbi.c] Populated string would exceed %d bytes", --- 353,358 ---- do { written += (s - querystring); ! // MAX_STRING_LEN-1 so we still have room for a null at the end ! if (written >= MAX_STRING_LEN-1) { ap_log_perror(APLOG_MARK, APLOG_ERR, 0, r->pool, "[mod_authn_dbi.c] Populated string would exceed %d bytes", *************** *** 688,697 **** } - static void *create_authn_dbi_config(apr_pool_t * p, server_rec * s) - { - /* TODO: fix this.... this is very bad... */ - return NULL; - } - static apr_status_t safe_dbi_rel_server(apr_reslist_t * dbi_pool, dbi_rest * server, request_rec * r) --- 688,691 ---- *************** *** 1126,1131 **** apr_ssize_t len; const char *userdata_key = "mod_authn_dbi_init"; - /* dbi_config *conf = ap_get_module_config(s->module_config, - * &authn_dbi_module); */ apr_pool_userdata_get(&data, userdata_key, s->process->pool); --- 1120,1123 ---- *************** *** 1215,1219 **** create_authn_dbi_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ ! create_authn_dbi_config, /* server config creator */ NULL, /* merge server config */ authn_dbi_cmds, /* command apr_table_t */ --- 1207,1211 ---- create_authn_dbi_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ ! NULL, /* server config creator */ NULL, /* merge server config */ authn_dbi_cmds, /* command apr_table_t */ |
From: <fir...@us...> - 2004-02-08 05:58:04
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31438 Modified Files: ChangeLog Log Message: fixed small things. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 8 Feb 2004 03:31:31 -0000 1.5 --- ChangeLog 8 Feb 2004 05:55:05 -0000 1.6 *************** *** 1,3 **** --- 1,9 ---- -------------------------------------------------------------------------------------------------------- + 07.02.2004 22:57 (MST), firechipmunk + - Removed create_authn_dbi_config(...) since it is not used. + - Few cleanups from Brice Tebbs + + + -------------------------------------------------------------------------------------------------------- 07.02.2004 20:33 (MST), firechipmunk - Fixed strcmp on MySQL. Spotted by Brice Tebbs. |
From: <fir...@us...> - 2004-02-08 04:05:02
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14930/src Modified Files: Makefile.am mod_authn_dbi.c Log Message: fixed up thread safety options. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 8 Feb 2004 03:11:09 -0000 1.4 --- Makefile.am 8 Feb 2004 04:02:03 -0000 1.5 *************** *** 2,10 **** libmod_authn_dbi_la_SOURCES = mod_authn_dbi.c ! libmod_authn_dbi_la_CFLAGS = -I$(DBI_INCLUDES) libmod_authn_dbi_la_LDFLAGS = -L$(DBI_LIB) -ldbi - INCLUDES=$(MONO_CFLAGS) lib_LTLIBRARIES = libmod_authn_dbi.la --- 2,9 ---- libmod_authn_dbi_la_SOURCES = mod_authn_dbi.c ! libmod_authn_dbi_la_CFLAGS = -I$(DBI_INCLUDES) libmod_authn_dbi_la_LDFLAGS = -L$(DBI_LIB) -ldbi lib_LTLIBRARIES = libmod_authn_dbi.la Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mod_authn_dbi.c 8 Feb 2004 03:31:31 -0000 1.11 --- mod_authn_dbi.c 8 Feb 2004 04:02:03 -0000 1.12 *************** *** 58,62 **** #endif ! #ifdef DBI_NOT_THREAD_SAFE static apr_thread_mutex_t *dbi_lock = NULL; #endif --- 58,62 ---- #endif ! #if DBI_NOT_THREAD_SAFE static apr_thread_mutex_t *dbi_lock = NULL; #endif |
From: <fir...@us...> - 2004-02-08 04:05:02
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14930 Modified Files: configure.in Log Message: fixed up thread safety options. Index: configure.in =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 8 Feb 2004 03:11:09 -0000 1.4 --- configure.in 8 Feb 2004 04:02:03 -0000 1.5 *************** *** 11,14 **** --- 11,17 ---- AM_PROG_LIBTOOL + # XXXX: Write an option for this. + DBI_NOT_THREAD_SAFE=1 + AC_MSG_CHECKING(for --with-dbi) AC_ARG_WITH(dbi, [ --with-dbi=PATH Path to dbi], *************** *** 163,167 **** AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`" AC_MSG_RESULT($AP_INCLUDES) ! CFLAGS="$CFLAGS $AP_INCLUDES" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) --- 166,170 ---- AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`" AC_MSG_RESULT($AP_INCLUDES) ! CFLAGS="${CFLAGS} $AP_INCLUDES -DDBI_NOT_THREAD_SAFE=${DBI_NOT_THREAD_SAFE}" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
From: <fir...@us...> - 2004-02-08 03:34:29
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10587 Modified Files: ChangeLog Log Message: Make sure we use thread locking for mysql drivers. This was spotted by Brice Tebbs. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 8 Feb 2004 03:11:09 -0000 1.4 --- ChangeLog 8 Feb 2004 03:31:31 -0000 1.5 *************** *** 1,3 **** --- 1,8 ---- -------------------------------------------------------------------------------------------------------- + 07.02.2004 20:33 (MST), firechipmunk + - Fixed strcmp on MySQL. Spotted by Brice Tebbs. + + + -------------------------------------------------------------------------------------------------------- 07.02.2004 20:14 (MST), firechipmunk - Use APXS for the Install Target. |
From: <fir...@us...> - 2004-02-08 03:34:29
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10587/src Modified Files: mod_authn_dbi.c Log Message: Make sure we use thread locking for mysql drivers. This was spotted by Brice Tebbs. Index: mod_authn_dbi.c =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/mod_authn_dbi.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mod_authn_dbi.c 8 Feb 2004 02:18:28 -0000 1.10 --- mod_authn_dbi.c 8 Feb 2004 03:31:31 -0000 1.11 *************** *** 217,221 **** dbi_conn_set_option(myres->conn, "dbname", name); #if DBI_NOT_THREAD_SAFE ! if (strcmp(driver, "mysql")) { apr_thread_mutex_lock(dbi_lock); } --- 217,221 ---- dbi_conn_set_option(myres->conn, "dbname", name); #if DBI_NOT_THREAD_SAFE ! if (strcmp(driver, "mysql") == 0) { apr_thread_mutex_lock(dbi_lock); } *************** *** 234,238 **** } #if DBI_NOT_THREAD_SAFE ! if (strcmp(driver, "mysql")) { apr_thread_mutex_unlock(dbi_lock); } --- 234,238 ---- } #if DBI_NOT_THREAD_SAFE ! if (strcmp(driver, "mysql") == 0) { apr_thread_mutex_unlock(dbi_lock); } |
From: <fir...@us...> - 2004-02-08 03:14:26
|
Update of /cvsroot/mod-auth/mod_authn_dbi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7684/src Modified Files: Makefile.am Log Message: - Use APXS for the Install Target. - Moved Post Apache 2.1 Release items to their own TODO section. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 3 Nov 2003 16:03:25 -0000 1.3 --- Makefile.am 8 Feb 2004 03:11:09 -0000 1.4 *************** *** 12,17 **** @if test ! -L mod_authn_dbi.so ; then ln -s .libs/libmod_authn_dbi.so mod_authn_dbi.so ; fi ! install: ! $(INSTALL) -m 644 .libs/libmod_authn_dbi.so $(LIBEXECDIR)/mod_authn_dbi.so @echo "" @echo "" --- 12,17 ---- @if test ! -L mod_authn_dbi.so ; then ln -s .libs/libmod_authn_dbi.so mod_authn_dbi.so ; fi ! install: make_so ! @${APXS} -i -a -n authn_dbi mod_authn_dbi.so @echo "" @echo "" |
From: <fir...@us...> - 2004-02-08 03:14:26
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7684 Modified Files: ChangeLog TODO autogen.sh configure.in Log Message: - Use APXS for the Install Target. - Moved Post Apache 2.1 Release items to their own TODO section. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 8 Feb 2004 02:27:35 -0000 1.3 --- ChangeLog 8 Feb 2004 03:11:09 -0000 1.4 *************** *** 1,3 **** --- 1,9 ---- -------------------------------------------------------------------------------------------------------- + 07.02.2004 20:14 (MST), firechipmunk + - Use APXS for the Install Target. + - Moved Post Apache 2.1 Release items to their own TODO section. + + + -------------------------------------------------------------------------------------------------------- 07.02.2004 19:30 (MST), firechipmunk - Fixed .cvsignore so annoying files are not seen by 'cvs update' Index: TODO =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TODO 31 Dec 2003 05:36:13 -0000 1.4 --- TODO 8 Feb 2004 03:11:09 -0000 1.5 *************** *** 5,8 **** --- 5,16 ---- ----- Upcoming Versions: + Post Apache 2.1 Release: + - Create Binary Releases (rpm and deb?) + - Get into Package Systems: (post 1.0?) + - Debian + - FreeBSD + - Gentoo + - Lunar + 1.0.0 - Testimonials / Who is using it - put it on the website? *************** *** 13,19 **** - with mod_authn_cache? - Classic MySQL, PgSQL, SQLite.. etc? - - Create Patches to use 2.1 Authentication on 2.0.XX Releases? - Update Documentation (README Specificly needs to be reworked) - Test on all supported libdbi databases. - Test on 32bit, 64bit, little/big endian machines (might be a little exterme) - Linux x86 --- 21,30 ---- - with mod_authn_cache? - Classic MySQL, PgSQL, SQLite.. etc? - Update Documentation (README Specificly needs to be reworked) - Test on all supported libdbi databases. + + MySQL + + PostgreSQL + - SQLite + - mSQL - Test on 32bit, 64bit, little/big endian machines (might be a little exterme) - Linux x86 *************** *** 23,48 **** - Linux MIPS [chip] - PPC? - - Create Binary Releases (rpm and deb?) - * For now perhaps just create /debian/ and RPM .specs files, - pending a 2.1/2.2 -release of Apache? - - Get into Package Systems: (post 1.0?) - * requires httpd 2.1 or 2.2 -release? - - Debian - - FreeBSD - - Gentoo - - Lunar 0.9.0 - Include HTML/XML Documentation in Releases? ! - Bigger Files... ! - Use APXS for Makefiles [chip] ! - Remove extra files from CVS (autoconf/make stuff we don't need) [chip] ! - Have external people look for security issues (Prep for 1.0) - Create "security-issues" contact address (for whole auth project?) - Mangle usernames [axel] - More SQL Variables [axel] - Support mod_dbi_pool [chip?] - - Merge In Cyan changes to Mainline? [chip] - * These Officaly Might break how the Digest RFC Works... - Send Announcements: - SourceForge --- 34,48 ---- - Linux MIPS [chip] - PPC? 0.9.0 - Include HTML/XML Documentation in Releases? ! - Create Plain Text XSL Stuff ! + Use APXS for Makefiles [chip] ! + Remove extra files from CVS (autoconf/make stuff we don't need) [chip] ! ? Have external people look for security issues (Prep for 1.0) - Create "security-issues" contact address (for whole auth project?) - Mangle usernames [axel] - More SQL Variables [axel] - Support mod_dbi_pool [chip?] - Send Announcements: - SourceForge Index: autogen.sh =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/autogen.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** autogen.sh 8 Feb 2004 02:23:53 -0000 1.5 --- autogen.sh 8 Feb 2004 03:11:09 -0000 1.6 *************** *** 6,14 **** aclocal autoheader automake --add-missing --copy ! ! echo ! echo "Using `autoconf --version`, if you have problems" ! echo "while building then edit autogen.sh and rerun it..." ! echo autoconf --- 6,13 ---- aclocal autoheader + touch NEWS automake --add-missing --copy ! rm NEWS autoconf + rm -rf autom4te.cache + Index: configure.in =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 3 Nov 2003 16:03:22 -0000 1.3 --- configure.in 8 Feb 2004 03:11:09 -0000 1.4 *************** *** 2,6 **** AC_INIT(src/mod_authn_dbi.c) AM_MAINTAINER_MODE ! AM_INIT_AUTOMAKE(mod_authn_dbi, 0.0.7) AM_CONFIG_HEADER(include/mod_authn_dbi_config.h:config.in) --- 2,6 ---- AC_INIT(src/mod_authn_dbi.c) AM_MAINTAINER_MODE ! AM_INIT_AUTOMAKE(mod_authn_dbi, 0.9.0) AM_CONFIG_HEADER(include/mod_authn_dbi_config.h:config.in) *************** *** 177,180 **** --- 177,181 ---- AC_SUBST(DBI_LIB) AC_SUBST(CFLAGS) + AC_SUBST(APXS) AC_OUTPUT(Makefile src/Makefile) |
From: <fir...@us...> - 2004-02-08 02:30:34
|
Update of /cvsroot/mod-auth/mod_authn_dbi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv610 Modified Files: ChangeLog Added Files: .cvsignore Log Message: added lots of cvsignore action --- NEW FILE: .cvsignore --- Makefile Makefile.in aclocal.m4 autom4te.cache compile config.guess config.in config.log config.status config.sub configure depcomp install-sh libtool ltmain.sh missing mkinstalldirs stamp-h.in Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-auth/mod_authn_dbi/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 8 Feb 2004 02:18:28 -0000 1.2 --- ChangeLog 8 Feb 2004 02:27:35 -0000 1.3 *************** *** 1,3 **** --- 1,8 ---- -------------------------------------------------------------------------------------------------------- + 07.02.2004 19:30 (MST), firechipmunk + - Fixed .cvsignore so annoying files are not seen by 'cvs update' + + + -------------------------------------------------------------------------------------------------------- 07.02.2004 19:19 (MST), firechipmunk - Changed to ASL 2.0 |