mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 00:29:35 -05:00
Add debug to nt project, remove lint.
This commit is contained in:
parent
0b924192e7
commit
61c5f7a2ca
4 changed files with 22 additions and 18 deletions
|
|
@ -45,10 +45,10 @@ void (lutil_debug)( int level, int debug, const char *fmt, ... )
|
|||
#ifdef HAVE_WINSOCK
|
||||
if( log_file == NULL )
|
||||
{
|
||||
log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
|
||||
log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "openldap.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
log_file = fopen( "slapd.log", "w" );
|
||||
log_file = fopen( "openldap.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,10 @@ SOURCE=..\..\include\ac\bytes.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\debug.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\include\getopt-compat.h"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#include <windows.h>
|
||||
#include <winerror.h>
|
||||
|
||||
#define __RETSTR( x ) case x: return #x;
|
||||
|
||||
char *GetErrorString( int err )
|
||||
{
|
||||
static char msgBuf[1024];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,22 @@
|
|||
// ntservice.c
|
||||
/* ntservice.c */
|
||||
#include "portable.h"
|
||||
|
||||
#include <ac/stdlib.h>
|
||||
#include <ac/string.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <winsvc.h>
|
||||
|
||||
#include "ldap.h"
|
||||
|
||||
#define ldap_debug slap_debug
|
||||
extern int slap_debug;
|
||||
|
||||
#include "ldap_log.h"
|
||||
#include "ldap_pvt_thread.h"
|
||||
#include <winsvc.h>
|
||||
#include <sys/types.h>
|
||||
#include <ac/string.h>
|
||||
|
||||
|
||||
#include "ldap_defaults.h"
|
||||
|
||||
|
|
@ -27,13 +36,6 @@ ldap_pvt_thread_t start_status_tid, stop_status_tid;
|
|||
|
||||
void (*stopfunc)(int);
|
||||
|
||||
/* in main.c */
|
||||
void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
|
||||
|
||||
|
||||
/* in wsa_err.c */
|
||||
char *WSAGetLastErrorString( void );
|
||||
|
||||
/* in nt_err.c */
|
||||
char *GetLastErrorString( void );
|
||||
|
||||
|
|
@ -167,7 +169,7 @@ static void *start_status_routine( void *ptr )
|
|||
SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
|
||||
break;
|
||||
case WAIT_FAILED:
|
||||
/* theres been some proble with WaitForSingleObject so tell the Service
|
||||
/* theres been some problem with WaitForSingleObject so tell the Service
|
||||
* Control Manager to wait 30 seconds before deploying its assasin and
|
||||
* then leave the thread. */
|
||||
SLAPDServiceStatus.dwCheckPoint++;
|
||||
|
|
@ -209,7 +211,7 @@ static void *stop_status_routine( void *ptr )
|
|||
SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
|
||||
break;
|
||||
case WAIT_FAILED:
|
||||
/* theres been some proble with WaitForSingleObject so tell the Service
|
||||
/* theres been some problem with WaitForSingleObject so tell the Service
|
||||
* Control Manager to wait 30 seconds before deploying its assasin and
|
||||
* then leave the thread. */
|
||||
SLAPDServiceStatus.dwCheckPoint++;
|
||||
|
|
@ -232,7 +234,7 @@ void WINAPI SLAPDServiceCtrlHandler( IN DWORD Opcode)
|
|||
case SERVICE_CONTROL_STOP:
|
||||
case SERVICE_CONTROL_SHUTDOWN:
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "Service Shutdown ordered\n", 0, 0 );
|
||||
Debug( LDAP_DEBUG_TRACE, "Service Shutdown ordered\n", 0, 0, 0 );
|
||||
SLAPDServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
|
||||
SLAPDServiceStatus.dwCheckPoint++;
|
||||
SLAPDServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL * 2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue