upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 15:10:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Additional mods to fix NT single threaded support.

Browse source
This commit is contained in:
Kurt Zeilenga 1999-11-01 22:00:18 +00:00
parent b7af076fee
commit 5b5db4def6
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ac/unistd.h
View file

@ -21,6 +21,10 @@
# include <unistd.h>
#endif
#if HAVE_PROCESS_H
# include <process.h>
#endif
/* note: callers of crypt(3) should include <ac/crypt.h> */
#ifdef __MINGW32__

3
include/ldap_pvt_thread.h
View file

@ -137,8 +137,7 @@ typedef struct ldap_pvt_thread_lwp_cv ldap_pvt_thread_cond_t;
LDAP_END_DECL
/* If we're in the NT env at all, we want these defs, threaded or not (which should be fixed) */
#elif defined(WINNT) || defined(_WINNT) || defined(_WIN32) || defined(HAVE_NT_THREADS)
#elif defined(HAVE_NT_THREADS)
LDAP_BEGIN_DECL

32
servers/slapd/main.c
View file

@ -38,18 +38,19 @@ void CommenceStartupProcessing( LPCTSTR serviceName,
void ReportSlapdShutdownComplete( void );
void *getRegParam( char *svc, char *value );
#define SERVICE_EXIT( e, n ) \
if ( is_NT_Service ) \
{ \
SLAPDServiceStatus.dwWin32ExitCode = e; \
SLAPDServiceStatus.dwServiceSpecificExitCode = n; \
}
#define SERVICE_EXIT( e, n ) do { \
if ( is_NT_Service ) { \
SLAPDServiceStatus.dwWin32ExitCode = (e); \
SLAPDServiceStatus.dwServiceSpecificExitCode = (n); \
} \
} while ( 0 )
#else
#define SERVICE_EXIT( e, n )
#define MAIN_RETURN(x) return(x)
#endif
#ifdef HAVE_NT_EVENT_MANAGER
#ifdef HAVE_NT_EVENT_LOG
void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
void LogSlapdStoppedEvent( char *svc );
#endif
@ -111,7 +112,7 @@ usage( char *name )
#ifdef LOG_LOCAL4
"\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
#endif
#ifdef HAVE_WINSOCK
#ifdef HAVE_NT_EVENT_LOG
"\t-n NTserviceName\tNT service name\n"
#endif
@ -145,8 +146,11 @@ int main( int argc, char **argv )
#ifdef LOG_LOCAL4
int syslogUser = DEFAULT_SYSLOG_USER;
#endif
#ifdef HAVE_WINSOCK
#ifdef HAVE_NT_EVENT_LOG
char *NTservice = SERVICE_NAME;
#endif
#ifdef HAVE_NT_SERVICE_MANAGER
char *configfile = ".\\slapd.conf";
#else
char *configfile = SLAPD_DEFAULT_CONFIGFILE;
@ -223,7 +227,7 @@ int main( int argc, char **argv )
#ifdef LDAP_CONNECTIONLESS
"c"
#endif
#ifdef HAVE_WINSOCK
#ifdef HAVE_NT_EVENT_LOG
"n:"
#endif
#ifdef HAVE_TLS
@ -312,7 +316,7 @@ int main( int argc, char **argv )
break;
#endif /* SETUID && GETUID */
#ifdef HAVE_WINSOCK
#ifdef HAVE_NT_EVENT_LOG
case 'n': /* NT service name */
NTservice = ch_strdup( optarg );
break;
@ -392,7 +396,7 @@ int main( int argc, char **argv )
#endif
#ifndef HAVE_WINSOCK
lutil_detach( no_detach, 0 );
lutil_detach( no_detach, 0 );
#endif /* HAVE_WINSOCK */
#ifdef CSRIMALLOC
@ -428,7 +432,7 @@ int main( int argc, char **argv )
}
}
#ifdef HAVE_NT_EVENT_MANAGER
#ifdef HAVE_NT_EVENT_LOG
LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls );
#endif
@ -449,7 +453,7 @@ destroy:
rc |= slap_destroy();
stop:
#ifdef HAVE_NT_EVENT_MANAGER
#ifdef HAVE_NT_EVENT_LOG
LogSlapdStoppedEvent( NTservice );
#endif