httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_auth_dbm.c
Date Thu, 21 Sep 2000 13:19:35 GMT
wrowe       00/09/21 06:19:34

  Modified:    src      Apache.dsw makefile.win CHANGES
               src/os/win32 BaseAddr.ref
               src/lib/sdbm sdbm.dsp
               src/modules/standard mod_auth_dbm.c
  Added:       src/os/win32 ApacheModuleAuthDBM.dsp
  Log:
    Build mod_auth_dbm using SDBM for Win32.
  
  Revision  Changes    Path
  1.3       +33 -0     apache-1.3/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Apache.dsw,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Apache.dsw	2000/06/17 06:48:47	1.2
  +++ Apache.dsw	2000/09/21 13:19:21	1.3
  @@ -60,6 +60,24 @@
   
   ###############################################################################
   
  +Project: "ApacheModuleAuthDBM"=".\os\win32\ApacheModuleAuthDBM.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name ApacheCore
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name sdbm
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>
   
   Package=<5>
  @@ -302,6 +320,9 @@
       Begin Project Dependency
       Project_Dep_Name xmlparse
       End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name ApacheModuleAuthDBM
  +    End Project Dependency
   }}}
   
   ###############################################################################
  @@ -403,6 +424,18 @@
   ###############################################################################
   
   Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +}}}
  +
  +###############################################################################
  +
  +Project: "sdbm"=".\lib\sdbm\sdbm.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  
  
  
  1.5       +6 -0      apache-1.3/src/makefile.win
  
  Index: makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/makefile.win,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- makefile.win	2000/06/21 18:35:33	1.4
  +++ makefile.win	2000/09/21 13:19:21	1.5
  @@ -80,6 +80,9 @@
   	 $(MAKE) $(MAKEOPT) -f xmltok.mak CFG="xmltok - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f xmlparse.mak CFG="xmlparse - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd ../..
  +	cd lib/sdbm
  +	 $(MAKE) $(MAKEOPT) -f sdbm.mak CFG="sdbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	cd ../..
   	cd main
   	 $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  @@ -100,6 +103,7 @@
   	 $(MAKE) $(MAKEOPT) -f ApacheModuleUserTrack.mak CFG="ApacheModuleUserTrack - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f ApacheModuleRewrite.mak CFG="ApacheModuleRewrite - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f ApacheModuleAuthDigest.mak CFG="ApacheModuleAuthDigest - Win32
$(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f ApacheModuleAuthDBM.mak CFG="ApacheModuleAuthDBM - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
   	cd ..\..
   	cd modules\proxy
   	 $(MAKE) $(MAKEOPT) -f ApacheModuleProxy.mak CFG="ApacheModuleProxy - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  @@ -126,11 +130,13 @@
   	copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleAuthDigest$(SHORT)\ApacheModuleAuthDigest.dll $(INSTDIR)\modules
  +	copy os\win32\ApacheModuleAuthDBM$(SHORT)\ApacheModuleAuthDBM.dll $(INSTDIR)\modules
   	copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules
   	copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin
   	copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin
   	copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin
   	copy support\$(LONG)\rotatelogs.exe $(INSTDIR)\bin
  +        copy support\dbmmanage $(INSTDIR)\bin\dbmmanage.pl
   
   _installdll:
    	cd os\win32\installer\installdll
  
  
  
  1.1577    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1576
  retrieving revision 1.1577
  diff -u -r1.1576 -r1.1577
  --- CHANGES	2000/09/20 20:08:05	1.1576
  +++ CHANGES	2000/09/21 13:19:22	1.1577
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.13
   
  +  *) Add mod_auth_dbm (sdbm flavor) binary build for Win32.
  +     [William Rowe]
  +
     *) Overhaul of dbmmanage to allow a groups arg (as in Apache 1.2)
        as well as a comment arg to the add, adduser and update cmds.
        update allows the user to clear or preserve pw/groups/comment.
  
  
  
  1.2       +1 -0      apache-1.3/src/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/BaseAddr.ref,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseAddr.ref	2000/05/10 20:42:12	1.1
  +++ BaseAddr.ref	2000/09/21 13:19:29	1.2
  @@ -25,3 +25,4 @@
   mod_status           0x6FE40000    0x00010000
   mod_usertrack        0x6FE30000    0x00010000
   mod_proxy            0x6FE10000    0x00020000
  +mod_auth_dbm         0x6FE00000    0x00010000
  
  
  
  1.1                  apache-1.3/src/os/win32/ApacheModuleAuthDBM.dsp
  
  Index: ApacheModuleAuthDBM.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="ApacheModuleAuthDBM" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=ApacheModuleAuthDBM - Win32 Release
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "ApacheModuleAuthDBM.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "ApacheModuleAuthDBM.mak" CFG="ApacheModuleAuthDBM - Win32 Release"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "ApacheModuleAuthDBM - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "ApacheModuleAuthDBM - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir ".\Release"
  # PROP BASE Intermediate_Dir ".\Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "ApacheModuleAuthDBMR"
  # PROP Intermediate_Dir "ApacheModuleAuthDBMR"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D
"WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows
/dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
  
  !ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir ".\Debug"
  # PROP BASE Intermediate_Dir ".\Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "ApacheModuleAuthDBMD"
  # PROP Intermediate_Dir "ApacheModuleAuthDBMD"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm"
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows
/dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
/base:@"BaseAddr.ref",mod_auth_dbm
  
  !ENDIF 
  
  # Begin Target
  
  # Name "ApacheModuleAuthDBM - Win32 Release"
  # Name "ApacheModuleAuthDBM - Win32 Debug"
  # Begin Source File
  
  SOURCE=..\..\modules\standard\mod_auth_dbm.c
  # End Source File
  # End Target
  # End Project
  
  
  
  1.2       +3 -2      apache-1.3/src/lib/sdbm/sdbm.dsp
  
  Index: sdbm.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/sdbm/sdbm.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sdbm.dsp	2000/09/21 13:06:14	1.1
  +++ sdbm.dsp	2000/09/21 13:19:31	1.2
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="sdbm" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 5.00
  +# Microsoft Developer Studio Generated Build File, Format Version 6.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Static Library" 0x0104
  @@ -22,6 +22,7 @@
   !MESSAGE 
   
   # Begin Project
  +# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -66,7 +67,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "WIN32"
/D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "WIN32"
/D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.49      +8 -3      apache-1.3/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mod_auth_dbm.c	1999/08/02 20:50:22	1.48
  +++ mod_auth_dbm.c	2000/09/21 13:19:33	1.49
  @@ -74,7 +74,12 @@
   #include "http_core.h"
   #include "http_log.h"
   #include "http_protocol.h"
  -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
  +#if defined(WIN32)
  +#include <sdbm.h>
  +#define dbm_open sdbm_open
  +#define dbm_fetch sdbm_fetch
  +#define dbm_close sdbm_close
  +#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
       && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
   #include <db1/ndbm.h>
   #else
  @@ -142,7 +147,7 @@
       {NULL}
   };
   
  -module dbm_auth_module;
  +module MODULE_VAR_EXPORT dbm_auth_module;
   
   static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
   {
  @@ -311,7 +316,7 @@
   }
   
   
  -module dbm_auth_module =
  +module MODULE_VAR_EXPORT dbm_auth_module =
   {
       STANDARD_MODULE_STUFF,
       NULL,			/* initializer */
  
  
  

Mime
View raw message