httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard mod_auth.c mod_autoindex.c
Date Tue, 23 Nov 1999 13:47:03 GMT
rbb         99/11/23 05:47:02

  Modified:    src/lib/apr/include apr_lib.h apr_md5.h
               src/lib/apr/lib Makefile.in
               src/lib/apr/misc/unix Makefile.in
               src/lib/apr/mmap/unix mmap.c
               src/main http_core.c http_request.c
               src/modules/standard mod_auth.c mod_autoindex.c
  Removed:     src/lib/apr/inc apr_fnmatch.h apr_pools.h
  Log:
  Update some dependancies.  Move the final two files out of apr/inc and into
  apr/include.  Basically just finish some cleanup from some changes I've
  been making over the last two days.
  
  Revision  Changes    Path
  1.16      +7 -0      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_lib.h	1999/11/22 18:00:59	1.15
  +++ apr_lib.h	1999/11/23 13:46:54	1.16
  @@ -268,6 +268,13 @@
   			       ap_vformatter_buff_t *c, const char *fmt,
   			       va_list ap);
   
  +
  +/* A small routine to validate a plain text password with a password
  + * that has been encrypted using any algorithm APR knows about.
  + */
  +API_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash);
  +
  +
   /*
    * These are snprintf implementations based on ap_vformatter().
    *
  
  
  
  1.4       +0 -1      apache-2.0/src/lib/apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_md5.h	1999/11/22 18:01:01	1.3
  +++ apr_md5.h	1999/11/23 13:46:55	1.4
  @@ -119,7 +119,6 @@
   API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[16], APR_MD5_CTX * context);
   API_EXPORT(ap_status_t) ap_MD5Encode(const char *password, const char *salt,
   			      char *result, size_t nbytes);
  -API_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash);
   
   #ifdef __cplusplus
   }
  
  
  
  1.6       +8 -7      apache-2.0/src/lib/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/10/30 05:59:21	1.5
  +++ Makefile.in	1999/11/23 13:46:56	1.6
  @@ -66,8 +66,8 @@
    ../include/apr_file_io.h
   apr_execve.o: apr_execve.c ../include/apr_config.h
   apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \
  - $(INCDIR)/apr_fnmatch.h ../include/apr_lib.h ../include/apr_general.h \
  - ../include/apr_errno.h ../include/apr_file_io.h
  + ../include/apr_fnmatch.h ../include/apr_errno.h ../include/apr_lib.h \
  + ../include/apr_general.h ../include/apr_file_io.h
   apr_getpass.o: apr_getpass.c ../include/apr_config.h \
    ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
    ../include/apr_file_io.h
  @@ -75,9 +75,9 @@
    ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
    ../include/apr_file_io.h
   apr_pools.o: apr_pools.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h $(INCDIR)/apr_pools.h \
  - ../include/apr_lib.h ../include/apr_file_io.h ../include/apr_lock.h \
  - ../misc/unix/misc.h
  + ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
  + ../include/apr_lock.h ../misc/unix/misc.h ../include/apr_getopt.h
   apr_signal.o: apr_signal.c ../include/apr_config.h \
    ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
    ../include/apr_file_io.h
  @@ -88,5 +88,6 @@
    ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
    ../include/apr_file_io.h
   apr_tables.o: apr_tables.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h $(INCDIR)/apr_pools.h \
  - ../include/apr_lib.h ../include/apr_file_io.h ../misc/unix/misc.h
  + ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_pools.h ../include/apr_lib.h ../include/apr_file_io.h \
  + ../misc/unix/misc.h ../include/apr_getopt.h
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/09/23 18:19:05	1.5
  +++ Makefile.in	1999/11/23 13:46:57	1.6
  @@ -53,8 +53,8 @@
   # DO NOT REMOVE
   getopt.o: getopt.c misc.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h
  + ../../include/apr_file_io.h ../../include/apr_getopt.h
   start.o: start.c ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - $(INCDIR)/apr_pools.h ../../include/apr_lib.h \
  - ../../include/apr_file_io.h misc.h
  + ../../include/apr_pools.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h misc.h ../../include/apr_getopt.h
  
  
  
  1.8       +0 -1      apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mmap.c	1999/11/13 00:07:23	1.7
  +++ mmap.c	1999/11/23 13:46:58	1.8
  @@ -90,7 +90,6 @@
   ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, 
          ap_size_t size, ap_context_t *cont)
   {
  -    int fd;
       caddr_t mm;
      
       if (file == NULL || file->buffered || file->filedes == -1)
  
  
  
  1.26      +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_core.c	1999/11/20 11:56:12	1.25
  +++ http_core.c	1999/11/23 13:46:59	1.26
  @@ -67,7 +67,7 @@
   #include "http_log.h"
   #include "rfc1413.h"
   #include "util_md5.h"
  -#include "fnmatch.h"
  +#include "apr_fnmatch.h"
   #include "http_connection.h"
   
   /* Allow Apache to use ap_mmap */
  
  
  
  1.10      +1 -1      apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_request.c	1999/11/16 18:30:43	1.9
  +++ http_request.c	1999/11/23 13:46:59	1.10
  @@ -76,7 +76,7 @@
   #if 0
   #include "scoreboard.h"
   #endif
  -#include "fnmatch.h"
  +#include "apr_fnmatch.h"
   
   HOOK_STRUCT(
   	    HOOK_LINK(translate_name)
  
  
  
  1.12      +5 -4      apache-2.0/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_auth.c	1999/11/17 21:39:42	1.11
  +++ mod_auth.c	1999/11/23 13:47:01	1.12
  @@ -203,7 +203,7 @@
       (auth_config_rec *) ap_get_module_config(r->per_dir_config, &auth_module);
       const char *sent_pw;
       char *real_pw;
  -    char *invalid_pw;
  +    ap_status_t invalid_pw;
       int res;
   
       if ((res = ap_get_basic_auth_pw(r, &sent_pw)))
  @@ -221,10 +221,11 @@
   	return AUTH_REQUIRED;
       }
       invalid_pw = ap_validate_password(sent_pw, real_pw);
  -    if (invalid_pw != NULL) {
  +    if (invalid_pw != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  -		      "user %s: authentication failure for \"%s\": %s",
  -		      r->user, r->uri, invalid_pw);
  +		      "user %s: authentication failure for \"%s\": "
  +                      "Password Mismatch",
  +		      r->user, r->uri);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
  
  
  
  1.14      +1 -1      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_autoindex.c	1999/11/09 03:41:11	1.13
  +++ mod_autoindex.c	1999/11/23 13:47:01	1.14
  @@ -72,7 +72,7 @@
   #include "http_log.h"
   #include "http_main.h"
   #include "util_script.h"
  -#include "fnmatch.h"
  +#include "apr_fnmatch.h"
   
   module MODULE_VAR_EXPORT autoindex_module;
   
  
  
  

Mime
View raw message