date:19990802

Re: cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c

1999-08-02 Thread Dirk-Willem van Gulik

On 2 Aug 1999 [EMAIL PROTECTED] wrote:

>src/include ap.h ap_md5.h ap_sha1.h
>src/main http_main.c
>src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
>   Removed: src/include ap_checkpass.h

I am struggling with the same now; moving a few base64 encoders into one
ap_base64.c file.

What is the cut-off point for moving all declarations into ap.h as
opposed to adding a few individual ap_*.h file ?

Or was the current ap_md5.h simply wrong to begin with ? And caused
by its legacy start; as an import from elsewhere ? 

Seeing your change I kind of prefer the ap.h collation; but I wonder a
bit, as the base64 and validate_passwd functions are only used in just
one or two files. ap.h is not getting any smaller. Or is that a 
needless worry ?

Dw.

>   RCS file: /home/cvs/apache-1.3/src/include/ap.h,v
>   retrieving revision 1.21
>   retrieving revision 1.22
>   diff -u -r1.21 -r1.22
>   --- ap.h1999/05/31 17:09:31 1.21
>   +++ ap.h1999/08/02 20:50:14 1.22
>   @@ -159,6 +159,7 @@
>   __attribute__((format(printf,3,4)));
>API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
>va_list ap);
>   +API_EXPORT(char *) ap_validate_password(const char *passwd, const char 
> *hash);
>
>#ifdef __cplusplus
>}
>

cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c

1999-08-02 Thread coar

coar99/08/02 13:50:23

  Modified:src/ap   ap_sha1.c
   src/include ap.h ap_md5.h ap_sha1.h
   src/main http_main.c
   src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
  Removed: src/include ap_checkpass.h
  Log:
Fix some spacing issues in the SHA1 and ap_validate_password
changes.  ap_validate_password() isn't called by anything in
the core, so the link may well omit it -- causing DSO mod_auth*
modules to fail to load.  Force a reference to it into the
core server so that won't happen.  As soon as ap_checkpass.c
includes any other symbols routinely referenced by the core,
the kludge at the bottom of http_main.c can go away.  Or earlier,
if someone finds a better solution.
  
  Revision  ChangesPath
  1.2   +100 -91   apache-1.3/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===
  RCS file: /home/cvs/apache-1.3/src/ap/ap_sha1.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_sha1.c 1999/08/02 10:13:44 1.1
  +++ ap_sha1.c 1999/08/02 20:50:12 1.2
  @@ -55,7 +55,7 @@
*
* The only exported function:
*
  - *ap_sha1_base64(char *clear, int len, char *out);
  + *ap_sha1_base64(const char *clear, int len, char *out);
*
* provides a means to SHA1 crypt/encode a plaintext password in
* a way which makes password files compatible with those commonly
  @@ -140,19 +140,19 @@
   #define SHA_DIGESTSIZE  20

   typedef struct {
  -   LONG digest[5]; /* message digest */
  -   LONG count_lo, count_hi;/* 64-bit bit count */
  -   LONG data[16];  /* SHA data buffer */
  -   int local;  /* unprocessed amount in data */
  -   } SHA_INFO;
  -
  -void sha_init(SHA_INFO *);
  -void sha_update(SHA_INFO *, BYTE *, int);
  -void sha_final(SHA_INFO *);
  -void sha_raw_swap(SHA_INFO *);
  -void output64chunk(unsigned char, unsigned char, unsigned char,
  -   int, unsigned char **);
  -void encode_mime64(unsigned char *, unsigned char *, int);
  +LONG digest[5]; /* message digest */
  +LONG count_lo, count_hi;/* 64-bit bit count */
  +LONG data[16];  /* SHA data buffer */
  +int local;  /* unprocessed amount in data */
  +} SHA_INFO;
  +
  +static void sha_init(SHA_INFO *);
  +static void sha_update(SHA_INFO *, const BYTE *, int);
  +static void sha_final(SHA_INFO *);
  +static void sha_raw_swap(SHA_INFO *);
  +static void output64chunk(unsigned char, unsigned char, unsigned char,
  +   int, unsigned char **);
  +static void encode_mime64(unsigned char *, unsigned char *, int);
   void sha1_base64(char *, int, char *);
   
   /* do SHA transformation */
  @@ -217,14 +217,15 @@
   }
   
   union endianTest {
  -  long Long;
  -  char Char[sizeof(long)];
  +long Long;
  +char Char[sizeof(long)];
   };
   
  -char isLittleEndian() {
  -  static union endianTest u;
  -  u.Long = 1;
  -  return(u.Char[0]==1);
  +static char isLittleEndian(void)
  +{
  +static union endianTest u;
  +u.Long = 1;
  +return (u.Char[0] == 1);
   }
   
   /* change endianness of data */
  @@ -236,25 +237,25 @@
   BYTE ct[4], *cp;
   
   if (isLittleEndian()) {/* do the swap only if it is little endian */
  -  count /= sizeof(LONG);
  -  cp = (BYTE *) buffer;
  -  for (i = 0; i < count; ++i) {
  -   ct[0] = cp[0];
  -   ct[1] = cp[1];
  -   ct[2] = cp[2];
  -   ct[3] = cp[3];
  -   cp[0] = ct[3];
  -   cp[1] = ct[2];
  -   cp[2] = ct[1];
  -   cp[3] = ct[0];
  -   cp += sizeof(LONG);
  -  }
  + count /= sizeof(LONG);
  + cp = (BYTE *) buffer;
  + for (i = 0; i < count; ++i) {
  + ct[0] = cp[0];
  + ct[1] = cp[1];
  + ct[2] = cp[2];
  + ct[3] = cp[3];
  + cp[0] = ct[3];
  + cp[1] = ct[2];
  + cp[2] = ct[1];
  + cp[3] = ct[0];
  + cp += sizeof(LONG);
  + }
   }
   }
   
   /* initialize the SHA digest */
   
  -void sha_init(SHA_INFO *sha_info)
  +static void sha_init(SHA_INFO *sha_info)
   {
   sha_info->digest[0] = 0x67452301L;
   sha_info->digest[1] = 0xefcdab89L;
  @@ -268,7 +269,7 @@
   
   /* update the SHA digest */
   
  -void sha_update(SHA_INFO *sha_info, BYTE *buffer, int count)
  +static void sha_update(SHA_INFO *sha_info, const BYTE *buffer, int count)
   {
   int i;
   
  @@ -289,7 +290,8 @@
if (sha_info->local == SHA_BLOCKSIZE) {
maybe_byte_reverse(sha_info->data, SHA_BLOCKSIZE);
sha_transform(sha_info);
  - } else {
  + }
  + else {
return;
}
   }
  @@ -306,7 +308,7 @@
   
   /* finish computing the SHA digest */
   
  -void sha_final(SHA_INFO *sha_info)
  +static void sha_final(SHA_I

cvs commit: apache-1.3/src/support httpd.exp

1999-08-02 Thread rasmus

rasmus  99/08/02 10:29:14

  Modified:src/support httpd.exp
  Log:
  In order for DSO modules to be able to use the bundled XML functions on AIX
  they need to be listed here.
  
  Revision  ChangesPath
  1.24  +34 -0 apache-1.3/src/support/httpd.exp
  
  Index: httpd.exp
  ===
  RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- httpd.exp 1999/07/29 17:54:14 1.23
  +++ httpd.exp 1999/08/02 17:29:13 1.24
  @@ -363,3 +363,37 @@
   ap_vsnprintf
   core_module
   top_module
  +XML_DefaultCurrent
  +XML_ErrorString
  +XML_ExternalEntityParserCreate
  +XML_GetBase
  +XML_GetBuffer
  +XML_GetCurrentByteCount
  +XML_GetCurrentByteIndex
  +XML_GetCurrentColumnNumber
  +XML_GetCurrentLineNumber
  +XML_GetErrorCode
  +XML_GetSpecifiedAttributeCount
  +XML_Parse
  +XML_ParseBuffer
  +XML_ParserCreate
  +XML_ParserCreateNS
  +XML_ParserFree
  +XML_SetBase
  +XML_SetCdataSectionHandler
  +XML_SetCharacterDataHandler
  +XML_SetCommentHandler
  +XML_SetDefaultHandler
  +XML_SetDefaultHandlerExpand
  +XML_SetElementHandler
  +XML_SetEncoding
  +XML_SetExternalEntityRefHandler
  +XML_SetExternalEntityRefHandlerArg
  +XML_SetNamespaceDeclHandler
  +XML_SetNotStandaloneHandler
  +XML_SetNotationDeclHandler
  +XML_SetProcessingInstructionHandler
  +XML_SetUnknownEncodingHandler
  +XML_SetUnparsedEntityDeclHandler
  +XML_SetUserData
  +XML_UseParserAsHandlerArg

cvs commit: apache-1.3/src CHANGES

1999-08-02 Thread dirkx

dirkx   99/08/02 03:48:13

  Modified:src  CHANGES
  Log:
  A change is a change by chance.
  
  Revision  ChangesPath
  1.1408+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1407
  retrieving revision 1.1408
  diff -u -r1.1407 -r1.1408
  --- CHANGES   1999/08/02 10:13:42 1.1407
  +++ CHANGES   1999/08/02 10:48:11 1.1408
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.8
   
  +  *  Support for compaq/tandem/com.
  + [Ottati, Michael" <[EMAIL PROTECTED]>, dirkx]
  +
 *) Added SHA1 password encryption support to easy migration from 
Netscape servers. See support/SHA1 for more information; based
on the code contributed by Clinton Wong <[EMAIL PROTECTED]>.

cvs commit: apache-1.3/src/support htdigest.c

1999-08-02 Thread dirkx

dirkx   99/08/02 03:45:38

  Modified:src  Configure
   src/helpers GuessOS
   src/include ap_config.h
   src/main util.c
   src/modules/proxy proxy_cache.c
   src/modules/standard mod_rewrite.h
   src/support htdigest.c
  Log:
  Folded in "Ottati, Michael" <[EMAIL PROTECTED]> patches
  for compaq/tandem. At this moment in time it is unclear if this
  is just a one-off effort, or that there is some long term future.
  But given the limited scope/quirks of the OS this might well be
  a non issue.
  
  Submitted by: "Ottati, Michael" <[EMAIL PROTECTED]>
  Reviewed by: dirkx
  PR: 4804
  
  Revision  ChangesPath
  1.365 +5 -0  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.364
  retrieving revision 1.365
  diff -u -r1.364 -r1.365
  --- Configure 1999/07/29 22:58:10 1.364
  +++ Configure 1999/08/02 10:45:29 1.365
  @@ -740,6 +740,11 @@
CC='cc'
RANLIB='true'
;;
  +*-tandem-oss)
  + OS='Tandem OSS'
  + CFLAGS="-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -g"
  + CC='c89'
  + ;;
   *) # default: Catch systems we don't know about
OS='Unknown and unsupported OS'
echo Sorry, but we cannot grok \"$PLAT\"
  
  
  
  1.62  +4 -0  apache-1.3/src/helpers/GuessOS
  
  Index: GuessOS
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/helpers/GuessOS,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- GuessOS   1999/07/30 05:14:08 1.61
  +++ GuessOS   1999/08/02 10:45:30 1.62
  @@ -150,6 +150,10 @@
echo "${MACHINE}-dec-osf"; exit 0
;;
   
  + NONSTOP_KERNEL:*:*:*)
  + echo "${MACHINE}-tandem-oss"; exit 0; 
  + ;;
  +
   QNX:*)
if [ "$VERSION" -gt 422 ]; then
echo "${MACHINE}-qssl-qnx32"
  
  
  
  1.265 +10 -1 apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.264
  retrieving revision 1.265
  diff -u -r1.264 -r1.265
  --- ap_config.h   1999/07/30 20:58:56 1.264
  +++ ap_config.h   1999/08/02 10:45:31 1.265
  @@ -922,6 +922,12 @@
   #undef  offsetof
   #define offsetof(s_type,field) ((size_t)&(((s_type*)0)->field))
   
  +#elif defined(__TANDEM)
  +#define NO_WRITEV
  +#define NO_KILLPG
  +#define NEED_INITGROUPS
  +#define NO_SLACK
  +
   #else
   /* Unknown system - Edit these to match */
   #ifdef BSD
  @@ -1005,8 +1011,11 @@
   #include 
   #include 
   #include 
  +#ifdef __TANDEM
  +#include 
  +#endif
   #include "ap_ctype.h"
  -#if !defined(MPE) && !defined(WIN32) && !defined(TPF)
  +#if !defined(MPE) && !defined(WIN32) && !defined(TPF) && !defined(__TANDEM)
   #include 
   #endif
   #ifndef WIN32
  
  
  
  1.168 +1 -1  apache-1.3/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- util.c1999/07/29 18:13:45 1.167
  +++ util.c1999/08/02 10:45:32 1.168
  @@ -1746,7 +1746,7 @@
   #ifdef NEED_INITGROUPS
   int initgroups(const char *name, gid_t basegid)
   {
  -#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || 
defined(TPF)
  +#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || 
defined(TPF) || defined(__TANDEM)
   /* QNX, MPE and BeOS do not appear to support supplementary groups. */
   return 0;
   #else /* ndef QNX */
  
  
  
  1.62  +6 -0  apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===
  RCS file: /x3/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- proxy_cache.c 1999/06/10 05:18:08 1.61
  +++ proxy_cache.c 1999/08/02 10:45:33 1.62
  @@ -69,6 +69,10 @@
   #endif /* WIN32 */
   #include "multithread.h"
   #include "ap_md5.h"
  +#ifdef __TANDEM
  +#include 
  +#include 
  +#endif
   
   DEF_Explain
   
  @@ -1140,6 +1144,8 @@
*p = '\0';
   #ifdef WIN32
if (mkdir(c->filename) < 0 && errno != EEXIST)
  +#elif defined(__TANDEM)
  + if (mkdir(c->filename, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != 
EEXIST)
   #else
if (mkdir(c->filename, S_IREAD | S_IWRITE | S_IEXEC) < 0 && errno 
!= EEXIST)
   #endif /* WIN32 */
  
  
  
  1.64  +1 -1  apache-1.3/src/modules/standard/mod_rewrite.h
  
  Index: mod_rewrite.h

cvs commit: apache-1.3/src/support/SHA1 README.sha1 convert-sha1.pl htpasswd-sha1.pl ldif-sha1.example

1999-08-02 Thread dirkx

dirkx   99/08/02 03:13:51

  Modified:htdocs/manual new_features_1_3.html
htdocs/manual/new_features_1_3.html src/CHANGES
src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src  CHANGES htdocs/manual/new_features_1_3.html
src/CHANGES src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src/ap   Makefile.tmpl ap_md5c.c
htdocs/manual/new_features_1_3.html src/CHANGES
src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src/include ap_md5.h htdocs/manual/new_features_1_3.html
src/CHANGES src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
htdocs/manual/new_features_1_3.html src/CHANGES
src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src/support README htpasswd.1 htpasswd.c
htdocs/manual/new_features_1_3.html src/CHANGES
src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
   src/support/SHA1 htdocs/manual/new_features_1_3.html
src/CHANGES src/ap/Makefile.tmpl src/ap/ap_md5c.c
src/include/ap_md5.h
src/modules/standard/mod_auth.c
src/modules/standard/mod_auth_db.c
src/modules/standard/mod_auth_dbm.c
src/support/README src/support/htpasswd.1
src/support/htpasswd.c
  Added:   htdocs/manual src/ap/ap_checkpass.c
src/include/ap_checkpass.h src/ap/ap_sha1.c
src/include/ap_sha1.h src/support/SHA1/README.sha1
src/support/SHA1/convert-sha1.pl
src/support/SHA1/htpasswd-sha1.pl
src/support/SHA1/ldif-sha1.example
   src  src/ap/ap_checkpass.c src/include/ap_checkpass.h
src/ap/ap_sha1.c src/include/ap_sha1.h
src/support/SHA1/README.sha1
src/support/SHA1/convert-sha1.pl
src/support/SHA1/htpasswd-sha1.pl
src/support/SHA1/ldif-sha1.example
   src/ap   ap_checkpass.c ap_sha1.c src/ap/ap_checkpass.c
src/include/ap_checkpass.h src/ap/ap_sha1.c
src/include/ap_sha1.h src/support/SHA1/README.sha1
src/support/SHA1/convert-sha1.pl
src/support/SHA1/htpasswd-sha1.pl
src/support/SHA1/ldif-sha1.example
   src/include ap_checkpass.h ap_sha1.h src/ap/ap_checkpass.c
src/include/ap_checkpass.h src/ap/ap_sha1.c
src/include/ap_sha1.h src/support/SHA1/README.sha1
src/support/SHA1/convert-sha1.pl
src/support/SHA1/htpass

cvs commit: apache-1.3/src/os/tpf os.c os.h

1999-08-02 Thread manoj

manoj   99/08/01 22:03:37

  Modified:htdocs/manual install-tpf.html
   src/os/tpf os.c os.h
  Log:
  Make the server compile cleanly on TPF.
  
  Submitted by: David McCreedy <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.7   +3 -0  apache-1.3/htdocs/manual/install-tpf.html
  
  Index: install-tpf.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/install-tpf.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -u -r1.6 -r1.7
  --- install-tpf.html  1999/04/27 20:36:24 1.6
  +++ install-tpf.html  1999/08/02 05:03:35 1.7
  @@ -124,6 +124,9 @@
   DO NOT modify the TPF=YES export variable.  If this is
   changed, the "Configure" script will not recognize TPF.
   
  +Remove the src/lib/expat-lite directory:
  +rm -r lib/expat-lite
  +
   Run the "Configure" script:
   Configure
   
  
  
  
  1.4   +7 -0  apache-1.3/src/os/tpf/os.c
  
  Index: os.c
  ===
  RCS file: /home/cvs/apache-1.3/src/os/tpf/os.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -u -r1.3 -r1.4
  --- os.c  1999/04/27 20:36:38 1.3
  +++ os.c  1999/08/02 05:03:36 1.4
  @@ -161,6 +161,13 @@
   return rv;
   }
  
  +/* the getpass function is not usable on TPF */
  +char *getpass(const char* prompt)
  +{
  +errno = EIO;
  +return((char *)NULL);
  +}
  +
   #ifndef __PIPE_
   int pipe(int fildes[2])
   {
  
  
  
  1.8   +1 -0  apache-1.3/src/os/tpf/os.h
  
  Index: os.h
  ===
  RCS file: /home/cvs/apache-1.3/src/os/tpf/os.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -u -r1.7 -r1.8
  --- os.h  1999/05/02 14:01:02 1.7
  +++ os.h  1999/08/02 05:03:36 1.8
  @@ -95,6 +95,7 @@
   struct server_rec;
   pid_t os_fork(struct server_rec *s, int slot);
   int os_check_server(char *server);
  +char *getpass(const char *prompt);
   extern char *ap_server_argv0;
   extern int scoreboard_fd;
   #include

Re: cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c

cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c

cvs commit: apache-1.3/src/support httpd.exp

cvs commit: apache-1.3/src CHANGES

cvs commit: apache-1.3/src/support htdigest.c

cvs commit: apache-1.3/src/support/SHA1 README.sha1 convert-sha1.pl htpasswd-sha1.pl ldif-sha1.example

cvs commit: apache-1.3/src/os/tpf os.c os.h

7 matches

Site Navigation

Mail list logo

Footer information