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-2.0/src/modules/standard mod_auth_dbm.c
Date Wed, 20 Sep 2000 04:54:07 GMT
wrowe       00/09/19 21:54:06

  Modified:    src      Apache.dsw Makefile.win
               src/os/win32 BaseAddr.ref
               src/lib/expat-lite xmlparse.dsp xmltok.dsp
               src/lib/sdbm sdbmlib.dsp
               src/modules/standard mod_auth_dbm.c
  Added:       src/os/win32 ApacheModuleAuthDBM.dsp
  Log:
    Get mod_auth_dbm building using Apache's sdbmlib under WinNT.
  
    Bad conditional... need a better test to determine if we are using sdbm.
  
    Also - consistify linkage for expat-lite/sdmb to the same model as all
    the modules (no more nasty "conflicting linkage, use /nodefaultlib" msg.)
  
  Revision  Changes    Path
  1.21      +25 -1     apache-2.0/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Apache.dsw	2000/08/11 20:15:41	1.20
  +++ Apache.dsw	2000/09/20 04:54:03	1.21
  @@ -1,4 +1,4 @@
  -Microsoft Developer Studio Workspace File, Format Version 6.00
  +Microsoft Developer Studio Workspace File, Format Version 5.00
   # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
   
   ###############################################################################
  @@ -87,6 +87,27 @@
   
   ###############################################################################
   
  +Project: "ApacheModuleAuthDBM"=".\os\win32\ApacheModuleAuthDBM.dsp" - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name ApacheCoreDll
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name aprlibdll
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name sdbmlib
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>
   
   Package=<5>
  @@ -355,6 +376,9 @@
       End Project Dependency
       Begin Project Dependency
       Project_Dep_Name xmlparse
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name ApacheModuleAuthDBM
       End Project Dependency
   }}}
   
  
  
  
  1.24      +3 -0      apache-2.0/src/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.win	2000/07/31 20:50:17	1.23
  +++ Makefile.win	2000/09/20 04:54:03	1.24
  @@ -101,6 +101,7 @@
   	 $(MAKE) $(MAKEOPT) -f ApacheModuleSpeling.mak CFG="ApacheModuleSpeling - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
   	 $(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 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)
  @@ -129,12 +130,14 @@
   	copy os\win32\ApacheModuleAuthAnon$(SHORT)\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleAuthDigest$(SHORT)\ApacheModuleAuthDigest.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleCERNMeta$(SHORT)\ApacheModuleCERNMeta.dll $(INSTDIR)\modules
  +	copy os\win32\ApacheModuleDAV$(SHORT)\ApacheModuleDAV.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleExpires$(SHORT)\ApacheModuleExpires.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleFileCache$(SHORT)\ApacheModuleFileCache.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleHeaders$(SHORT)\ApacheModuleHeaders.dll $(INSTDIR)\modules
           copy os\win32\ApacheModuleRewrite$(SHORT)\ApacheModuleRewrite.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules
   	copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules
  +	copy os\win32\ApacheModuleAuthDBM$(SHORT)\ApacheModuleAuthDBM.dll $(INSTDIR)\modules
   #       copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules
           copy support\$(LONG)\ab.exe $(INSTDIR)\bin
           copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin
  
  
  
  1.6       +1 -0      apache-2.0/src/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/BaseAddr.ref,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseAddr.ref	2000/05/11 04:03:37	1.5
  +++ BaseAddr.ref	2000/09/20 04:54:04	1.6
  @@ -22,3 +22,4 @@
   mod_usertrack        0x6FE40000    0x00010000
   mod_proxy            0x6FE20000    0x00020000
   mod_file_cache       0x6FE00000    0x00020000
  +mod_auth_dbm         0x6FDF0000    0x00010000
  
  
  
  1.1                  apache-2.0/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" /YX /c
  # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\lib\apr\include" /I "..\..\lib\sdbm"
/I ".\\" /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 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll
/map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map
/machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /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" /YX
/c
  # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\lib\apr\include"
/I "..\..\lib\sdbm" /I ".\\" /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 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll
/map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
  # ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug
/machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
  # SUBTRACT LINK32 /incremental:no /map
  
  !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       +2 -2      apache-2.0/src/lib/expat-lite/xmlparse.dsp
  
  Index: xmlparse.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/xmlparse.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xmlparse.dsp	2000/07/03 08:26:52	1.1
  +++ xmlparse.dsp	2000/09/20 04:54:05	1.2
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLPARSE_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XMLPARSE_EXPORTS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XMLPARSE_EXPORTS" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "XMLPARSE_EXPORTS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLPARSE_EXPORTS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLPARSE_EXPORTS" /YX /FD /GZ /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/expat-lite/xmltok.dsp
  
  Index: xmltok.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/xmltok.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xmltok.dsp	2000/07/03 08:26:52	1.1
  +++ xmltok.dsp	2000/09/20 04:54:05	1.2
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLTOK_EXPORTS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XMLTOK_EXPORTS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "XMLTOK_EXPORTS" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLTOK_EXPORTS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "XMLTOK_EXPORTS" /YX /FD /GZ /c
   # SUBTRACT CPP /Fr
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  
  
  
  1.2       +6 -5      apache-2.0/src/lib/sdbm/sdbmlib.dsp
  
  Index: sdbmlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbmlib.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sdbmlib.dsp	2000/07/31 20:26:53	1.1
  +++ sdbmlib.dsp	2000/09/20 04:54:05	1.2
  @@ -26,7 +26,6 @@
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  -RSC=rc.exe
   
   !IF  "$(CFG)" == "sdbmlib - Win32 Release"
   
  @@ -40,10 +39,11 @@
   # PROP Output_Dir "Release"
   # PROP Intermediate_Dir "Release"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD
/c
  -# ADD CPP /nologo /W3 /GX /O2 /I "../apr/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D
"_LIB" /YX /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD
/c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../apr/include" /D "WIN32" /D "NDEBUG" /D "_MBCS"
/D "_LIB" /YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -63,10 +63,11 @@
   # PROP Output_Dir "Debug"
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"
/YX /FD /GZ /c
  -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../apr/include" /D "WIN32" /D "_DEBUG" /D "_MBCS"
/D "_LIB" /YX /FD /GZ /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"
/YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../apr/include" /D "WIN32" /D "_DEBUG" /D
"_MBCS" /D "_LIB" /YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.16      +17 -3     apache-2.0/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_auth_dbm.c	2000/08/02 05:27:14	1.15
  +++ mod_auth_dbm.c	2000/09/20 04:54:06	1.16
  @@ -76,7 +76,15 @@
   #include "http_log.h"
   #include "http_protocol.h"
   #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
  -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
  +
  +#if defined(WIN32) /* XXX: A better feature test is needed here */
  +#include "sdbm.h"
  +#define DBM SDBM
  +#define datum sdbm_datum
  +#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
  @@ -152,6 +160,7 @@
       DBM *f;
       datum d, q;
       char *pw = NULL;
  +    apr_status_t retval;
   
       q.dptr = user;
   #ifndef NETSCAPE_DBM_COMPAT
  @@ -159,11 +168,16 @@
   #else
       q.dsize = strlen(q.dptr) + 1;
   #endif
  -
   
  +#ifdef WIN32 /* XXX: Same bad symbol here - need feature macro */
  +    if (!(retval = dbm_open(&f, auth_dbmpwfile, O_RDONLY, 0664, r->pool))) {
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
  +		    "could not open sdbm auth file: %s", auth_dbmpwfile);
  +#else
       if (!(f = dbm_open(auth_dbmpwfile, O_RDONLY, 0664))) {
  -	ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r,
   		    "could not open dbm auth file: %s", auth_dbmpwfile);
  +#endif
   	return NULL;
       }
   
  
  
  

Mime
View raw message