From a8a05cbe48f55fcb9132352a923435ce177ca1b1 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 1 Mar 1999 22:37:05 +0000 Subject: [PATCH] Update NT port with support for -lldap_r and -lldbm. Also add initial slapd .dsw/.dsp files. Still needs work (mainly syslog). --- libraries/libldap_r/apitest.dsp | 89 +++++++ libraries/libldap_r/apitest.dsw | 56 ++++ libraries/libldap_r/libldap_r.dsp | 306 ++++++++++++++++++++++ libraries/libldap_r/libldap_r.dsw | 29 ++ libraries/libldap_r/ltest.dsp | 87 ++++++ libraries/libldap_r/ltest.dsw | 74 ++++++ libraries/libldap_r/rdwr.c | 2 + libraries/libldap_r/thr_nt.c | 1 + libraries/libldbm/ldbm.c | 16 +- libraries/libldbm/libldbm.dsp | 82 ++++++ servers/slapd/back-ldbm/alias.c | 1 - servers/slapd/back-ldbm/backldbm.dsp | 194 ++++++++++++++ servers/slapd/back-ldbm/cache.c | 4 - servers/slapd/back-ldbm/dbcache.c | 8 +- servers/slapd/back-ldbm/idl.c | 4 +- servers/slapd/back-ldbm/modify.c | 2 +- servers/slapd/back-ldbm/proto-back-ldbm.h | 4 +- servers/slapd/back-ldbm/startup.c | 3 +- servers/slapd/connection.c | 1 - servers/slapd/main.c | 10 +- servers/slapd/slapd.dsp | 239 +++++++++++++++++ servers/slapd/slapd.dsw | 74 ++++++ servers/slapd/tools/ldbmcat.c | 4 +- servers/slapd/tools/ldbmcat.dsp | 88 +++++++ servers/slapd/tools/ldbmcat.dsw | 44 ++++ servers/slapd/tools/ldbmtest.c | 18 +- servers/slapd/tools/ldbmtest.dsp | 88 +++++++ servers/slapd/tools/ldbmtest.dsw | 29 ++ servers/slapd/tools/ldif.c | 5 + servers/slapd/tools/ldif.dsp | 89 +++++++ servers/slapd/tools/ldif.dsw | 59 +++++ servers/slapd/value.c | 1 - servers/slurpd/fm.c | 17 +- servers/slurpd/lock.c | 4 + servers/slurpd/replog.c | 4 + servers/slurpd/slurp.h | 4 + servers/slurpd/slurpd.dsp | 163 ++++++++++++ servers/slurpd/slurpd.dsw | 53 ++++ 38 files changed, 1916 insertions(+), 40 deletions(-) create mode 100644 libraries/libldap_r/apitest.dsp create mode 100644 libraries/libldap_r/apitest.dsw create mode 100644 libraries/libldap_r/libldap_r.dsp create mode 100644 libraries/libldap_r/libldap_r.dsw create mode 100644 libraries/libldap_r/ltest.dsp create mode 100644 libraries/libldap_r/ltest.dsw create mode 100644 libraries/libldbm/libldbm.dsp create mode 100644 servers/slapd/back-ldbm/backldbm.dsp create mode 100644 servers/slapd/slapd.dsp create mode 100644 servers/slapd/slapd.dsw create mode 100644 servers/slapd/tools/ldbmcat.dsp create mode 100644 servers/slapd/tools/ldbmcat.dsw create mode 100644 servers/slapd/tools/ldbmtest.dsp create mode 100644 servers/slapd/tools/ldbmtest.dsw create mode 100644 servers/slapd/tools/ldif.dsp create mode 100644 servers/slapd/tools/ldif.dsw create mode 100644 servers/slurpd/slurpd.dsp create mode 100644 servers/slurpd/slurpd.dsw diff --git a/libraries/libldap_r/apitest.dsp b/libraries/libldap_r/apitest.dsp new file mode 100644 index 0000000000..f837599245 --- /dev/null +++ b/libraries/libldap_r/apitest.dsp @@ -0,0 +1,89 @@ +# Microsoft Developer Studio Project File - Name="apitest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=apitest - Win32 Debug +!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 "apitest.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 "apitest.mak" CFG="apitest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "apitest - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "apitest - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "apitest - 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 "..\Release" +# PROP Intermediate_Dir "Release\apitest" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD LINK32 oldap_r.lib olber32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" + +!ELSEIF "$(CFG)" == "apitest - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "apitest_" +# PROP BASE Intermediate_Dir "apitest_" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\Debug" +# PROP Intermediate_Dir "Debug\apitest" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 oldap_r.lib olber32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "apitest - Win32 Release" +# Name "apitest - Win32 Debug" +# Begin Source File + +SOURCE=..\libldap\apitest.c +# End Source File +# End Target +# End Project diff --git a/libraries/libldap_r/apitest.dsw b/libraries/libldap_r/apitest.dsw new file mode 100644 index 0000000000..af848c6ae9 --- /dev/null +++ b/libraries/libldap_r/apitest.dsw @@ -0,0 +1,56 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "apitest"=.\apitest.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name liblber + End Project Dependency +}}} + +############################################################################### + +Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libldap_r"=.\libldap_r.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp new file mode 100644 index 0000000000..beb07505d6 --- /dev/null +++ b/libraries/libldap_r/libldap_r.dsp @@ -0,0 +1,306 @@ +# Microsoft Developer Studio Project File - Name="libldap_r" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libldap_r - Win32 Debug +!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 "libldap_r.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 "libldap_r.mak" CFG="libldap_r - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libldap_r - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libldap_r - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "libldap_r - 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 "..\Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Release\oldap_r.lib" + +!ELSEIF "$(CFG)" == "libldap_r - 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 "..\Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Debug\oldap_r.lib" + +!ENDIF + +# Begin Target + +# Name "libldap_r - Win32 Release" +# Name "libldap_r - Win32 Debug" +# Begin Source File + +SOURCE=..\libldap\abandon.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\add.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\addentry.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\bind.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\cache.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\charset.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\cldap.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\compare.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\controls.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\delete.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\disptmpl.c +# End Source File +# Begin Source File + +SOURCE=..\..\include\disptmpl.h +# End Source File +# Begin Source File + +SOURCE=..\libldap\dsparse.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\error.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\free.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\friendly.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getattr.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getdn.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getdxbyname.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getentry.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getfilter.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\getvalues.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\init.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\kbind.c +# End Source File +# Begin Source File + +SOURCE="..\liblber\lber-int.h" +# End Source File +# Begin Source File + +SOURCE=..\..\include\lber.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\lber_pvt.h +# End Source File +# Begin Source File + +SOURCE="..\libldap\ldap-int.h" +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_cdefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_features.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_log.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_pvt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldapconfig.h +# End Source File +# Begin Source File + +SOURCE=..\libldap\modify.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\modrdn.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\open.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\options.c +# End Source File +# Begin Source File + +SOURCE="..\libldap\os-ip.c" +# End Source File +# Begin Source File + +SOURCE=..\..\include\portable.h +# End Source File +# Begin Source File + +SOURCE=..\libldap\print.c +# End Source File +# Begin Source File + +SOURCE=.\rdwr.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\request.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\result.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\sbind.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\search.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\sort.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\srchpref.c +# End Source File +# Begin Source File + +SOURCE=..\..\include\srchpref.h +# End Source File +# Begin Source File + +SOURCE=..\libldap\string.c +# End Source File +# Begin Source File + +SOURCE=.\thr_nt.c +# End Source File +# Begin Source File + +SOURCE=.\thr_sleep.c +# End Source File +# Begin Source File + +SOURCE=.\thr_stub.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\ufn.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\unbind.c +# End Source File +# Begin Source File + +SOURCE=..\libldap\url.c +# End Source File +# Begin Source File + +SOURCE="..\libldap\util-int.c" +# End Source File +# End Target +# End Project diff --git a/libraries/libldap_r/libldap_r.dsw b/libraries/libldap_r/libldap_r.dsw new file mode 100644 index 0000000000..e80ddacc30 --- /dev/null +++ b/libraries/libldap_r/libldap_r.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libldap_r"=.\libldap_r.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/libraries/libldap_r/ltest.dsp b/libraries/libldap_r/ltest.dsp new file mode 100644 index 0000000000..60979e8e0f --- /dev/null +++ b/libraries/libldap_r/ltest.dsp @@ -0,0 +1,87 @@ +# Microsoft Developer Studio Project File - Name="ltest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=ltest - Win32 Debug +!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 "ltest.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 "ltest.mak" CFG="ltest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ltest - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "ltest - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ltest - 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 "Release\ltest" +# PROP Intermediate_Dir "Release\ltest" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib olutil32.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" + +!ELSEIF "$(CFG)" == "ltest - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ltest___" +# PROP BASE Intermediate_Dir "ltest___" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug\ltest" +# PROP Intermediate_Dir "Debug\ltest" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 oldap32.lib olber32.lib olutil32.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" + +!ENDIF + +# Begin Target + +# Name "ltest - Win32 Release" +# Name "ltest - Win32 Debug" +# Begin Source File + +SOURCE=.\test.c +# End Source File +# End Target +# End Project diff --git a/libraries/libldap_r/ltest.dsw b/libraries/libldap_r/ltest.dsw new file mode 100644 index 0000000000..6cc5a01052 --- /dev/null +++ b/libraries/libldap_r/ltest.dsw @@ -0,0 +1,74 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libldap"=.\libldap.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "liblutil"=..\liblutil\liblutil.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "ltest"=.\ltest.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libldap + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblber + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblutil + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap_r/rdwr.c index b4dabbc134..39fd9f7a9a 100644 --- a/libraries/libldap_r/rdwr.c +++ b/libraries/libldap_r/rdwr.c @@ -20,6 +20,8 @@ #include #include +#include + #include "ldap_pvt_thread.h" int diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c index 60276ab492..f6be8e6ad0 100644 --- a/libraries/libldap_r/thr_nt.c +++ b/libraries/libldap_r/thr_nt.c @@ -14,6 +14,7 @@ #include "ldap_pvt_thread.h" #if defined( HAVE_NT_THREADS ) +#include int ldap_pvt_thread_initialize( void ) diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c index db5749267d..f1b71327f3 100644 --- a/libraries/libldbm/ldbm.c +++ b/libraries/libldbm/ldbm.c @@ -9,8 +9,6 @@ #include "portable.h" -#include "syslog.h" - #ifdef SLAPD_LDBM #include @@ -77,6 +75,14 @@ int ldbm_shutdown( void ) #else +#ifdef HAVE_SYSLOG +#include "syslog.h" +#else +/* quick hack */ +#define LOG_INFO 1 +extern int syslog(int, char*, ...); +#endif + void * ldbm_malloc( size_t size ) { @@ -86,9 +92,7 @@ ldbm_malloc( size_t size ) static void ldbm_db_errcall( const char *prefix, char *message ) { - syslog( LOG_INFO, "ldbm_db_errcall(): %s %s", prefix, message ); - } /* a dbEnv for BERKELEYv2 */ @@ -294,7 +298,6 @@ ldbm_firstkey( LDBM ldbm ) #endif { Datum key, data; - int rc; #ifdef HAVE_BERKELEY_DB2 DBC *dbci; @@ -326,6 +329,7 @@ ldbm_firstkey( LDBM ldbm ) } } #else + int rc; LDBM_LOCK; @@ -355,7 +359,6 @@ ldbm_nextkey( LDBM ldbm, Datum key ) #endif { Datum data; - int rc; #ifdef HAVE_BERKELEY_DB2 void *oldKey = key.dptr; @@ -370,6 +373,7 @@ ldbm_nextkey( LDBM ldbm, Datum key ) if ( data.dptr ) free( data.dptr ); } #else + int rc; LDBM_LOCK; diff --git a/libraries/libldbm/libldbm.dsp b/libraries/libldbm/libldbm.dsp new file mode 100644 index 0000000000..e44dc46016 --- /dev/null +++ b/libraries/libldbm/libldbm.dsp @@ -0,0 +1,82 @@ +# Microsoft Developer Studio Project File - Name="libldbm" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libldbm - Win32 Debug +!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 "libldbm.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 "libldbm.mak" CFG="libldbm - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libldbm - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libldbm - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "libldbm - 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 "..\Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Release\oldbm32.lib" + +!ELSEIF "$(CFG)" == "libldbm - 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 "..\Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Debug\oldbm32.lib" + +!ENDIF + +# Begin Target + +# Name "libldbm - Win32 Release" +# Name "libldbm - Win32 Debug" +# Begin Source File + +SOURCE=.\ldbm.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c index a6e780143e..9cf28685b7 100644 --- a/servers/slapd/back-ldbm/alias.c +++ b/servers/slapd/back-ldbm/alias.c @@ -31,7 +31,6 @@ Entry *derefAlias_r ( Backend *be, struct ldbminfo *li = (struct ldbminfo *) be->be_private; /* to free cache entries */ Attribute *a; int depth; - char **pastAliases; char *matched; Entry *origDN = e; diff --git a/servers/slapd/back-ldbm/backldbm.dsp b/servers/slapd/back-ldbm/backldbm.dsp new file mode 100644 index 0000000000..a7393c7c7a --- /dev/null +++ b/servers/slapd/back-ldbm/backldbm.dsp @@ -0,0 +1,194 @@ +# Microsoft Developer Studio Project File - Name="backldbm" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=backldbm - Win32 Debug +!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 "backldbm.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 "backldbm.mak" CFG="backldbm - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "backldbm - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "backldbm - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "backldbm - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "backldbm - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\\" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "backldbm - Win32 Release" +# Name "backldbm - Win32 Debug" +# Begin Source File + +SOURCE=.\abandon.c +# End Source File +# Begin Source File + +SOURCE=.\add.c +# End Source File +# Begin Source File + +SOURCE=.\alias.c +# End Source File +# Begin Source File + +SOURCE=.\attr.c +# End Source File +# Begin Source File + +SOURCE=".\back-ldbm.h" +# End Source File +# Begin Source File + +SOURCE=.\bind.c +# End Source File +# Begin Source File + +SOURCE=.\cache.c +# End Source File +# Begin Source File + +SOURCE=.\close.c +# End Source File +# Begin Source File + +SOURCE=.\compare.c +# End Source File +# Begin Source File + +SOURCE=.\config.c +# End Source File +# Begin Source File + +SOURCE=.\dbcache.c +# End Source File +# Begin Source File + +SOURCE=.\delete.c +# End Source File +# Begin Source File + +SOURCE=.\dn2id.c +# End Source File +# Begin Source File + +SOURCE=.\external.h +# End Source File +# Begin Source File + +SOURCE=.\filterindex.c +# End Source File +# Begin Source File + +SOURCE=.\group.c +# End Source File +# Begin Source File + +SOURCE=.\id2children.c +# End Source File +# Begin Source File + +SOURCE=.\id2entry.c +# End Source File +# Begin Source File + +SOURCE=.\idl.c +# End Source File +# Begin Source File + +SOURCE=.\index.c +# End Source File +# Begin Source File + +SOURCE=.\init.c +# End Source File +# Begin Source File + +SOURCE=.\kerberos.c +# End Source File +# Begin Source File + +SOURCE=.\modify.c +# End Source File +# Begin Source File + +SOURCE=.\modrdn.c +# End Source File +# Begin Source File + +SOURCE=.\nextid.c +# End Source File +# Begin Source File + +SOURCE=".\proto-back-ldbm.h" +# End Source File +# Begin Source File + +SOURCE=.\search.c +# End Source File +# Begin Source File + +SOURCE=.\startup.c +# End Source File +# Begin Source File + +SOURCE=.\unbind.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c index fe88ed895d..43ad64616f 100644 --- a/servers/slapd/back-ldbm/cache.c +++ b/servers/slapd/back-ldbm/cache.c @@ -89,8 +89,6 @@ cache_entry_rdwr_destroy(Entry *e) static int cache_entry_private_init( Entry*e ) { - struct ldbm_entry_info *lei; - #ifdef LDAP_DEBUG assert( e->e_private == NULL ); #endif @@ -114,8 +112,6 @@ cache_entry_private_init( Entry*e ) static int cache_entry_private_destroy( Entry*e ) { - struct ldbm_entry_info *lei; - #ifdef LDAP_DEBUG assert( e->e_private ); #endif diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c index 7d044c34a8..f563cb61c1 100644 --- a/servers/slapd/back-ldbm/dbcache.c +++ b/servers/slapd/back-ldbm/dbcache.c @@ -31,8 +31,9 @@ ldbm_cache_open( int i, lru; time_t oldtime, curtime; char buf[MAXPATHLEN]; - LDBM db; +#ifdef HAVE_ST_BLKSIZE struct stat st; +#endif sprintf( buf, "%s%s%s%s", li->li_directory, DEFAULT_DIRSEP, name, suffix ); @@ -103,9 +104,12 @@ ldbm_cache_open( li->li_dbcache[i].dbc_name = ch_strdup( buf ); li->li_dbcache[i].dbc_refcnt = 1; li->li_dbcache[i].dbc_lastref = curtime; +#ifdef HAVE_ST_BLKSIZE if ( stat( buf, &st ) == 0 ) { li->li_dbcache[i].dbc_blksize = st.st_blksize; - } else { + } else +#endif + { li->li_dbcache[i].dbc_blksize = DEFAULT_BLOCKSIZE; } li->li_dbcache[i].dbc_maxids = (li->li_dbcache[i].dbc_blksize / diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c index 6542fc9f85..dd4867ffe5 100644 --- a/servers/slapd/back-ldbm/idl.c +++ b/servers/slapd/back-ldbm/idl.c @@ -15,7 +15,7 @@ static ID_BLOCK* idl_dup( ID_BLOCK *idl ); /* Allocate an ID_BLOCK with room for nids ids */ ID_BLOCK * -idl_alloc( int nids ) +idl_alloc( unsigned int nids ) { ID_BLOCK *new; @@ -615,7 +615,7 @@ idl_insert_key( * 3 id not inserted, block must be split */ int -idl_insert( ID_BLOCK **idl, ID id, int maxids ) +idl_insert( ID_BLOCK **idl, ID id, unsigned int maxids ) { unsigned int i, j; diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c index 940d2c808b..94389a84bf 100644 --- a/servers/slapd/back-ldbm/modify.c +++ b/servers/slapd/back-ldbm/modify.c @@ -28,7 +28,7 @@ ldbm_back_modify( char *matched; LDAPModList *ml; Entry *e; - int i, err; + int err; Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0); diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h index ef7261e76a..14c20cd2a1 100644 --- a/servers/slapd/back-ldbm/proto-back-ldbm.h +++ b/servers/slapd/back-ldbm/proto-back-ldbm.h @@ -98,12 +98,12 @@ Entry * id2entry_rw LDAP_P(( Backend *be, ID id, int rw )); * idl.c */ -ID_BLOCK * idl_alloc LDAP_P(( int nids )); +ID_BLOCK * idl_alloc LDAP_P(( unsigned int nids )); ID_BLOCK * idl_allids LDAP_P(( Backend *be )); void idl_free LDAP_P(( ID_BLOCK *idl )); ID_BLOCK * idl_fetch LDAP_P(( Backend *be, struct dbcache *db, Datum key )); int idl_insert_key LDAP_P(( Backend *be, struct dbcache *db, Datum key, ID id )); -int idl_insert LDAP_P(( ID_BLOCK **idl, ID id, int maxids )); +int idl_insert LDAP_P(( ID_BLOCK **idl, ID id, unsigned int maxids )); int idl_delete_key LDAP_P(( Backend *be, struct dbcache *db, Datum key, ID id )); ID_BLOCK * idl_intersection LDAP_P(( Backend *be, ID_BLOCK *a, ID_BLOCK *b )); ID_BLOCK * idl_union LDAP_P(( Backend *be, ID_BLOCK *a, ID_BLOCK *b )); diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c index 2b52a07ecc..c579c207c3 100644 --- a/servers/slapd/back-ldbm/startup.c +++ b/servers/slapd/back-ldbm/startup.c @@ -3,6 +3,7 @@ #include "portable.h" #include +#include #include #include @@ -87,7 +88,7 @@ ldbm_back_shutdown( #ifdef HAVE_BERKELEY_DB2 void -ldbm_db_errcall( const char *prefix, char *message ) +ldbm_db_errcall( const char *prefix, const char *message ) { Debug( LDAP_DEBUG_ANY, "ldbm_db_errcall(): %s %s", prefix, message, 0 ); } diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index e8f09b46c0..4a8ed5462f 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -25,7 +25,6 @@ static void * connection_operation( void *arg_v ) { struct co_arg *arg = arg_v; - unsigned long len; ldap_pvt_thread_mutex_lock( &arg->co_conn->c_opsmutex ); arg->co_conn->c_opsinitiated++; diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 3d67f85a98..f8b3d871b2 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -201,12 +201,16 @@ main( int argc, char **argv ) if ( ! inetd ) { int status; - (void) SIGNAL( SIGPIPE, SIG_IGN ); (void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing ); (void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown ); - (void) SIGNAL( SIGTERM, slap_set_shutdown ); - (void) SIGNAL( SIGINT, slap_set_shutdown ); +#ifdef SIGPIPE + (void) SIGNAL( SIGPIPE, SIG_IGN ); +#endif +#ifdef SIGHUP (void) SIGNAL( SIGHUP, slap_set_shutdown ); +#endif + (void) SIGNAL( SIGINT, slap_set_shutdown ); + (void) SIGNAL( SIGTERM, slap_set_shutdown ); #ifdef LDAP_DEBUG lutil_detach( ldap_debug, 0 ); diff --git a/servers/slapd/slapd.dsp b/servers/slapd/slapd.dsp new file mode 100644 index 0000000000..238716dd90 --- /dev/null +++ b/servers/slapd/slapd.dsp @@ -0,0 +1,239 @@ +# Microsoft Developer Studio Project File - Name="slapd" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=slapd - Win32 Debug +!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 "slapd.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 "slapd.mak" CFG="slapd - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "slapd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "slapd - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "slapd - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD 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:console /machine:I386 + +!ELSEIF "$(CFG)" == "slapd - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD 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:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "slapd - Win32 Release" +# Name "slapd - Win32 Debug" +# Begin Source File + +SOURCE=.\abandon.c +# End Source File +# Begin Source File + +SOURCE=.\acl.c +# End Source File +# Begin Source File + +SOURCE=.\aclparse.c +# End Source File +# Begin Source File + +SOURCE=.\add.c +# End Source File +# Begin Source File + +SOURCE=.\attr.c +# End Source File +# Begin Source File + +SOURCE=.\ava.c +# End Source File +# Begin Source File + +SOURCE=.\backend.c +# End Source File +# Begin Source File + +SOURCE=.\bind.c +# End Source File +# Begin Source File + +SOURCE=.\ch_malloc.c +# End Source File +# Begin Source File + +SOURCE=.\charray.c +# End Source File +# Begin Source File + +SOURCE=.\compare.c +# End Source File +# Begin Source File + +SOURCE=.\config.c +# End Source File +# Begin Source File + +SOURCE=.\configinfo.c +# End Source File +# Begin Source File + +SOURCE=.\connection.c +# End Source File +# Begin Source File + +SOURCE=.\daemon.c +# End Source File +# Begin Source File + +SOURCE=.\delete.c +# End Source File +# Begin Source File + +SOURCE=.\dn.c +# End Source File +# Begin Source File + +SOURCE=.\entry.c +# End Source File +# Begin Source File + +SOURCE=.\filter.c +# End Source File +# Begin Source File + +SOURCE=.\filterentry.c +# End Source File +# Begin Source File + +SOURCE=.\init.c +# End Source File +# Begin Source File + +SOURCE=.\lock.c +# End Source File +# Begin Source File + +SOURCE=.\main.c +# End Source File +# Begin Source File + +SOURCE=.\modify.c +# End Source File +# Begin Source File + +SOURCE=.\modrdn.c +# End Source File +# Begin Source File + +SOURCE=.\monitor.c +# End Source File +# Begin Source File + +SOURCE=.\operation.c +# End Source File +# Begin Source File + +SOURCE=.\phonetic.c +# End Source File +# Begin Source File + +SOURCE=".\proto-slap.h" +# End Source File +# Begin Source File + +SOURCE=.\repl.c +# End Source File +# Begin Source File + +SOURCE=.\result.c +# End Source File +# Begin Source File + +SOURCE=.\schema.c +# End Source File +# Begin Source File + +SOURCE=.\schemaparse.c +# End Source File +# Begin Source File + +SOURCE=.\search.c +# End Source File +# Begin Source File + +SOURCE=.\slap.h +# End Source File +# Begin Source File + +SOURCE=.\str2filter.c +# End Source File +# Begin Source File + +SOURCE=.\suffixalias.c +# End Source File +# Begin Source File + +SOURCE=.\unbind.c +# End Source File +# Begin Source File + +SOURCE=.\value.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/slapd.dsw b/servers/slapd/slapd.dsw new file mode 100644 index 0000000000..0cec8e877f --- /dev/null +++ b/servers/slapd/slapd.dsw @@ -0,0 +1,74 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "backldbm"=".\back-ldbm\backldbm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libldap_r"=..\..\libraries\libldap_r\libldap_r.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "slapd"=.\slapd.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name backldbm + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblber + End Project Dependency + Begin Project Dependency + Project_Dep_Name libldap_r + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/servers/slapd/tools/ldbmcat.c b/servers/slapd/tools/ldbmcat.c index fb3cbdd137..114a9a36ca 100644 --- a/servers/slapd/tools/ldbmcat.c +++ b/servers/slapd/tools/ldbmcat.c @@ -21,8 +21,6 @@ main( int argc, char **argv ) { Datum key, last, data; LDBM dbp; - int rc, type; - long id; char *file, *s; int printid = 1; @@ -88,4 +86,6 @@ main( int argc, char **argv ) ldbm_close( dbp ); exit( 0 ); + + return 0; /* NOT REACHED */ } diff --git a/servers/slapd/tools/ldbmcat.dsp b/servers/slapd/tools/ldbmcat.dsp new file mode 100644 index 0000000000..0007dc029b --- /dev/null +++ b/servers/slapd/tools/ldbmcat.dsp @@ -0,0 +1,88 @@ +# Microsoft Developer Studio Project File - Name="ldbmcat" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=ldbmcat - Win32 Debug +!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 "ldbmcat.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 "ldbmcat.mak" CFG="ldbmcat - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ldbmcat - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "ldbmcat - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ldbmcat - 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 "Release" +# PROP Intermediate_Dir "Release\ldbmcat" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD 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 libdb.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libraries\Release" + +!ELSEIF "$(CFG)" == "ldbmcat - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ldbmcat_" +# PROP BASE Intermediate_Dir "ldbmcat_" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug\ldbmcat" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 oldbm32.lib libdb.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libraries\Debug" + +!ENDIF + +# Begin Target + +# Name "ldbmcat - Win32 Release" +# Name "ldbmcat - Win32 Debug" +# Begin Source File + +SOURCE=.\ldbmcat.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/tools/ldbmcat.dsw b/servers/slapd/tools/ldbmcat.dsw new file mode 100644 index 0000000000..61f9a1bb4b --- /dev/null +++ b/servers/slapd/tools/ldbmcat.dsw @@ -0,0 +1,44 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ldbmcat"=.\ldbmcat.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libldbm + End Project Dependency +}}} + +############################################################################### + +Project: "libldbm"=..\..\..\libraries\libldbm\libldbm.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c index 78dcf8f915..a03fde8b00 100644 --- a/servers/slapd/tools/ldbmtest.c +++ b/servers/slapd/tools/ldbmtest.c @@ -11,14 +11,22 @@ #include #include +#ifdef HAVE_SYS_RESOURCE_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #ifdef HAVE_FCNTL_H #include #endif +#ifdef HAVE_IO_H +#include +#endif + #include "ldapconfig.h" #include "../slap.h" #include "../back-ldbm/back-ldbm.h" @@ -393,10 +401,10 @@ static void get_idlist( FILE *fp, Datum *data ) { char buf[20]; - int i, j, fd, tty; + int i, fd, tty; ID_BLOCK *p; - int psize, pmax; - int nmax, nids; + unsigned int psize, pmax; + unsigned int nmax, nids; fd = fileno( fp ); tty = isatty( fd ); @@ -464,7 +472,7 @@ get_entry( FILE *fp, Datum *data ) { char buf[BUFSIZ]; char *p; - int pmax, psize, len; + unsigned int pmax, psize, len; int fd; fd = fileno( fp ); @@ -635,7 +643,7 @@ print_entry( { ID id; ID_BLOCK *idl; - int i; + unsigned int i; char msg[2]; if ( data != NULL && data->dptr == NULL ) { diff --git a/servers/slapd/tools/ldbmtest.dsp b/servers/slapd/tools/ldbmtest.dsp new file mode 100644 index 0000000000..061705772c --- /dev/null +++ b/servers/slapd/tools/ldbmtest.dsp @@ -0,0 +1,88 @@ +# Microsoft Developer Studio Project File - Name="ldbmtest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=ldbmtest - Win32 Debug +!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 "ldbmtest.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 "ldbmtest.mak" CFG="ldbmtest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ldbmtest - Win32 Release" (based on\ + "Win32 (x86) Console Application") +!MESSAGE "ldbmtest - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ldbmtest - 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 "Release" +# PROP Intermediate_Dir "Release\ldbmtest" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD 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:console /machine:I386 + +!ELSEIF "$(CFG)" == "ldbmtest - 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 "Debug" +# PROP Intermediate_Dir "Debug\ldbmtest" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD 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:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "ldbmtest - Win32 Release" +# Name "ldbmtest - Win32 Debug" +# Begin Source File + +SOURCE=.\ldbmtest.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/tools/ldbmtest.dsw b/servers/slapd/tools/ldbmtest.dsw new file mode 100644 index 0000000000..f7f142df57 --- /dev/null +++ b/servers/slapd/tools/ldbmtest.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ldbmtest"=.\ldbmtest.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c index 4f84371cf8..c2cf5d049c 100644 --- a/servers/slapd/tools/ldif.c +++ b/servers/slapd/tools/ldif.c @@ -7,6 +7,10 @@ #include #include /* Get read() */ +#ifdef HAVE_IO_H +#include +#endif + #include "lber.h" #include "ldap.h" #include "ldif.h" @@ -91,4 +95,5 @@ main( int argc, char **argv ) } exit( 0 ); + return( 0 ); /* NOT REACHED */ } diff --git a/servers/slapd/tools/ldif.dsp b/servers/slapd/tools/ldif.dsp new file mode 100644 index 0000000000..8e0412d54f --- /dev/null +++ b/servers/slapd/tools/ldif.dsp @@ -0,0 +1,89 @@ +# Microsoft Developer Studio Project File - Name="ldif" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=ldif - Win32 Debug +!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 "ldif.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 "ldif.mak" CFG="ldif - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ldif - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "ldif - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ldif - 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 "Release" +# PROP Intermediate_Dir "Release/ldif" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD LINK32 oldif32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libraries\Release" + +!ELSEIF "$(CFG)" == "ldif - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ldif___W" +# PROP BASE Intermediate_Dir "ldif___W" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug/ldif" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 oldif32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libraries\Debug" + +!ENDIF + +# Begin Target + +# Name "ldif - Win32 Release" +# Name "ldif - Win32 Debug" +# Begin Source File + +SOURCE=.\ldif.c +# End Source File +# End Target +# End Project diff --git a/servers/slapd/tools/ldif.dsw b/servers/slapd/tools/ldif.dsw new file mode 100644 index 0000000000..e2c9733495 --- /dev/null +++ b/servers/slapd/tools/ldif.dsw @@ -0,0 +1,59 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ldif"=.\ldif.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libldif + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblber + End Project Dependency +}}} + +############################################################################### + +Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libldif"=..\..\libraries\libldif\libldif.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/servers/slapd/value.c b/servers/slapd/value.c index d8f72c4cd8..c14e8da70f 100644 --- a/servers/slapd/value.c +++ b/servers/slapd/value.c @@ -112,7 +112,6 @@ value_cmp( ) { int rc; - struct stat st1, st2; if ( normalize & 1 ) { v1 = ber_bvdup( v1 ); diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c index e63002f826..5523616ed1 100644 --- a/servers/slurpd/fm.c +++ b/servers/slurpd/fm.c @@ -52,14 +52,15 @@ fm( /* Set up our signal handlers: * SIG{TERM,INT,HUP} causes a shutdown * LDAP_SIGUSR1 - does nothing, used to wake up sleeping threads. - * LDAP_SIGUSR2 - causes slurpd to read its administrative interface file. - * (not yet implemented). + * LDAP_SIGUSR2 - causes a shutdown */ (void) SIGNAL( LDAP_SIGUSR1, do_nothing ); - (void) SIGNAL( LDAP_SIGUSR2, do_admin ); + (void) SIGNAL( LDAP_SIGUSR2, set_shutdown ); (void) SIGNAL( SIGTERM, set_shutdown ); (void) SIGNAL( SIGINT, set_shutdown ); +#ifdef SIGHUP (void) SIGNAL( SIGHUP, set_shutdown ); +#endif if ( sglob->one_shot_mode ) { if ( file_nonempty( sglob->slapd_replogfile )) { @@ -130,7 +131,7 @@ fm( * Set a global flag which signals that we're shutting down. */ static RETSIGTYPE -set_shutdown(int x) +set_shutdown(int sig) { int i; @@ -142,9 +143,7 @@ set_shutdown(int x) (sglob->replicas[ i ])->ri_wake( sglob->replicas[ i ]); } sglob->rq->rq_unlock( sglob->rq ); /* unlock queue */ - (void) SIGNAL( SIGTERM, set_shutdown ); /* reinstall handlers */ - (void) SIGNAL( SIGINT, set_shutdown ); - (void) SIGNAL( SIGHUP, set_shutdown ); + (void) SIGNAL( sig, set_shutdown ); /* reinstall handlers */ } @@ -154,9 +153,9 @@ set_shutdown(int x) * A do-nothing signal handler. */ RETSIGTYPE -do_nothing(int i) +do_nothing(int sig) { - (void) SIGNAL( LDAP_SIGUSR1, do_nothing ); + (void) SIGNAL( sig, do_nothing ); } diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c index 692c9c3f88..726fc3c5c8 100644 --- a/servers/slurpd/lock.c +++ b/servers/slurpd/lock.c @@ -23,8 +23,12 @@ #include #include +#ifdef HAVE_SYS_FILE_H #include +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #include "slurp.h" diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c index aa15411a13..0e8f2f4c2e 100644 --- a/servers/slurpd/replog.c +++ b/servers/slurpd/replog.c @@ -26,7 +26,11 @@ #include #include + +#ifdef HAVE_SYS_PARAM_H #include +#endif + #include #include "slurp.h" diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h index ace1eb79ba..768eef9a6a 100644 --- a/servers/slurpd/slurp.h +++ b/servers/slurpd/slurp.h @@ -22,8 +22,12 @@ #include #include #include +#include +#ifdef HAVE_SYS_PARAM_H #include +#endif +#include #include "lber.h" #include "ldap.h" diff --git a/servers/slurpd/slurpd.dsp b/servers/slurpd/slurpd.dsp new file mode 100644 index 0000000000..6a01519fd4 --- /dev/null +++ b/servers/slurpd/slurpd.dsp @@ -0,0 +1,163 @@ +# Microsoft Developer Studio Project File - Name="slurpd" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=slurpd - Win32 Debug +!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 "slurpd.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 "slurpd.mak" CFG="slurpd - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "slurpd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "slurpd - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "slurpd - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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:console /machine:I386 +# ADD 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:console /machine:I386 + +!ELSEIF "$(CFG)" == "slurpd - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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:console /debug /machine:I386 /pdbtype:sept +# ADD 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:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "slurpd - Win32 Release" +# Name "slurpd - Win32 Debug" +# Begin Source File + +SOURCE=.\admin.c +# End Source File +# Begin Source File + +SOURCE=.\args.c +# End Source File +# Begin Source File + +SOURCE=.\ch_malloc.c +# End Source File +# Begin Source File + +SOURCE=.\config.c +# End Source File +# Begin Source File + +SOURCE=.\fm.c +# End Source File +# Begin Source File + +SOURCE=.\globals.c +# End Source File +# Begin Source File + +SOURCE=.\globals.h +# End Source File +# Begin Source File + +SOURCE=.\ldap_op.c +# End Source File +# Begin Source File + +SOURCE=.\lock.c +# End Source File +# Begin Source File + +SOURCE=.\main.c +# End Source File +# Begin Source File + +SOURCE=".\proto-slurp.h" +# End Source File +# Begin Source File + +SOURCE=.\re.c +# End Source File +# Begin Source File + +SOURCE=.\reject.c +# End Source File +# Begin Source File + +SOURCE=.\replica.c +# End Source File +# Begin Source File + +SOURCE=.\replog.c +# End Source File +# Begin Source File + +SOURCE=.\ri.c +# End Source File +# Begin Source File + +SOURCE=.\rq.c +# End Source File +# Begin Source File + +SOURCE=.\sanity.c +# End Source File +# Begin Source File + +SOURCE=.\slurp.h +# End Source File +# Begin Source File + +SOURCE=.\st.c +# End Source File +# End Target +# End Project diff --git a/servers/slurpd/slurpd.dsw b/servers/slurpd/slurpd.dsw new file mode 100644 index 0000000000..7a3db39721 --- /dev/null +++ b/servers/slurpd/slurpd.dsw @@ -0,0 +1,53 @@ +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "liblber"=..\..\libraries\liblber\liblber.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libldap_r"=..\..\libraries\libldap_r\libldap_r.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "slurpd"=.\slurpd.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + -- 2.39.5