mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-01 04:29:35 -05:00
This commit includes many changes. All changes compile under NT but
have not been tested under UNIX.
A Summary of changes (likely incomplete):
NT changes:
Removed lint.
Clean up configuration support for "Debug", "Release", "SDebug",
and "SRelease" configurations.
Share output directories for clients, libraries,
and slapd. (maybe they should be combined further
and moved to build/{,S}{Debug,Release}).
Enable threading when _MT is defined.
Enable debuging when _DEBUG is defined.
Disable setting of NDEBUG under Release/SRelease. Asserts
are disabled in <ac/assert.h> when LDAP_DEBUG is not
defined.
Added 'build/main.dsp' Master project.
Removed non-slapd projects from slapd.dsp (see main.dsp).
Removed replaced many uses of _WIN32 macro with feature based
macros.
ldap_cdefs.h changes
#define LDAP_CONST const
(see below)
#define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST
To allow specifiers to be added before and after
the type declaration. (For DLL handling)
LBER/LDAP changes
Namespace changes:
s/lber_/ber_/ for here and there.
s/NAME_ERROR/LDAP_NAME_ERROR/g
Deleted NULLMSG and other NULL* macros for namespace reasons.
"const" libraries. Installed headers (ie: lber.h, ldap.h)
use LDAP_CONST macro. Normally set to 'const' when
__STDC__. Can be set externally to enable/disable
'constification' of external interface. Internal
interface always uses 'const'. Did not fix warnings
in -lldif (in lieu of new LDIF parser).
Added _ext API implementations (excepting search and bind).
Need to implement ldap_int_get_controls() for reponses
with controls.
Added numberous assert() checks.
LDAP_R
_MT defines HAVE_NT_THREADS
Added numberous assert() checks.
Changed ldap_pthread_t back to unsigned long. Used cast
to HANDLE in _join().
LDBM
Replaced _WIN32 with HAVE_SYSLOG
ud
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
slapd
Made connection sockbuf field a pointer to a sockbuf. This
removed slap.h dependency on lber-int.h. lber-int.h now only
included by those files needing to mess with the sockbuf.
Used ber_* functions/macros to access sockbuf internals whenever
possible.
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
Removed FD_SET unsigned lint
slapd/tools
Used EXEEXT to added ".exe" to routines. Need to define EXEEXT
under UNIX.
ldappasswd
Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand().
nt_debug
Minor cleanup. Added "portable.h" include and used <ac/*.h> where
appropriate. Added const to char* format argument.
403 lines
8.6 KiB
C
403 lines
8.6 KiB
C
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/signal.h>
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
#include <ac/unistd.h>
|
|
#include <ac/wait.h>
|
|
#include <ac/signal.h>
|
|
#include <ac/errno.h>
|
|
|
|
#include "ldapconfig.h"
|
|
#include "slap.h"
|
|
#include "lutil.h" /* Get lutil_detach() */
|
|
|
|
#ifdef LDAP_SIGCHLD
|
|
static RETSIGTYPE wait4child( int sig );
|
|
#endif
|
|
|
|
/*
|
|
* when more than one slapd is running on one machine, each one might have
|
|
* it's own LOCAL for syslogging and must have its own pid/args files
|
|
*/
|
|
|
|
#ifndef HAVE_MKVERSION
|
|
const char Versionstr[] = "OpenLDAP Standalone LDAP Server (slapd)";
|
|
#endif
|
|
|
|
#ifdef LOG_LOCAL4
|
|
|
|
#define DEFAULT_SYSLOG_USER LOG_LOCAL4
|
|
|
|
typedef struct _str2intDispatch {
|
|
char *stringVal;
|
|
int abbr;
|
|
int intVal;
|
|
} STRDISP, *STRDISP_P;
|
|
|
|
|
|
/* table to compute syslog-options to integer */
|
|
static STRDISP syslog_types[] = {
|
|
{ "LOCAL0", 6, LOG_LOCAL0 },
|
|
{ "LOCAL1", 6, LOG_LOCAL1 },
|
|
{ "LOCAL2", 6, LOG_LOCAL2 },
|
|
{ "LOCAL3", 6, LOG_LOCAL3 },
|
|
{ "LOCAL4", 6, LOG_LOCAL4 },
|
|
{ "LOCAL5", 6, LOG_LOCAL5 },
|
|
{ "LOCAL6", 6, LOG_LOCAL6 },
|
|
{ "LOCAL7", 6, LOG_LOCAL7 },
|
|
{ NULL }
|
|
};
|
|
|
|
static int cnvt_str2int( char *, STRDISP_P, int );
|
|
|
|
#endif /* LOG_LOCAL4 */
|
|
|
|
|
|
static void
|
|
usage( char *name )
|
|
{
|
|
fprintf( stderr, "usage: %s [-d ?|debuglevel] [-f configfile] [-p portnumber] [-s sysloglevel]", name );
|
|
fprintf( stderr, "\n [-a bind-address] [-i]" );
|
|
#if LDAP_CONNECTIONLESS
|
|
fprintf( stderr, " [-c]" );
|
|
#endif
|
|
#ifdef SLAPD_BDB2
|
|
fprintf( stderr, " [-t]" );
|
|
#endif
|
|
#ifdef LOG_LOCAL4
|
|
fprintf( stderr, " [-l sysloguser]" );
|
|
#endif
|
|
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
|
|
fprintf( stderr, " [-u user] [-g group]" );
|
|
#endif
|
|
fprintf( stderr, "\n" );
|
|
}
|
|
|
|
time_t starttime;
|
|
struct sockaddr_in bind_addr;
|
|
|
|
int
|
|
main( int argc, char **argv )
|
|
{
|
|
int i;
|
|
int inetd = 0;
|
|
int rc;
|
|
int tcps;
|
|
#ifdef LDAP_CONNECTIONLESS
|
|
int udp;
|
|
#endif
|
|
#ifdef LOG_LOCAL4
|
|
int syslogUser = DEFAULT_SYSLOG_USER;
|
|
#endif
|
|
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
|
|
char *username = NULL, *groupname = NULL;
|
|
#endif
|
|
char *configfile;
|
|
char *serverName;
|
|
int serverMode = SLAP_SERVER_MODE;
|
|
|
|
configfile = SLAPD_DEFAULT_CONFIGFILE;
|
|
|
|
(void) memset( (void*) &bind_addr, '\0', sizeof(bind_addr));
|
|
bind_addr.sin_family = AF_INET;
|
|
bind_addr.sin_addr.s_addr = htonl(INADDR_ANY);
|
|
bind_addr.sin_port = htons(LDAP_PORT);
|
|
|
|
g_argc = argc;
|
|
g_argv = argv;
|
|
|
|
while ( (i = getopt( argc, argv,
|
|
"d:f:ia:p:s:"
|
|
#ifdef LOG_LOCAL4
|
|
"l:"
|
|
#endif
|
|
#ifdef SLAPD_BDB2
|
|
"t"
|
|
#endif
|
|
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
|
|
"u:g:"
|
|
#endif
|
|
#ifdef LDAP_CONNECTIONLESS
|
|
"c"
|
|
#endif
|
|
)) != EOF ) {
|
|
switch ( i ) {
|
|
case 'a': /* bind address */
|
|
#ifdef HAVE_WINSOCK
|
|
if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg)))
|
|
#else
|
|
if(!inet_aton(optarg, &bind_addr.sin_addr))
|
|
#endif
|
|
{
|
|
fprintf(stderr, "invalid address (%s) for -a option", optarg);
|
|
}
|
|
break;
|
|
|
|
#ifdef LDAP_DEBUG
|
|
case 'd': /* turn on debugging */
|
|
if ( optarg[0] == '?' ) {
|
|
printf( "Debug levels:\n" );
|
|
printf( "\tLDAP_DEBUG_TRACE\t%d\n",
|
|
LDAP_DEBUG_TRACE );
|
|
printf( "\tLDAP_DEBUG_PACKETS\t%d\n",
|
|
LDAP_DEBUG_PACKETS );
|
|
printf( "\tLDAP_DEBUG_ARGS\t\t%d\n",
|
|
LDAP_DEBUG_ARGS );
|
|
printf( "\tLDAP_DEBUG_CONNS\t%d\n",
|
|
LDAP_DEBUG_CONNS );
|
|
printf( "\tLDAP_DEBUG_BER\t\t%d\n",
|
|
LDAP_DEBUG_BER );
|
|
printf( "\tLDAP_DEBUG_FILTER\t%d\n",
|
|
LDAP_DEBUG_FILTER );
|
|
printf( "\tLDAP_DEBUG_CONFIG\t%d\n",
|
|
LDAP_DEBUG_CONFIG );
|
|
printf( "\tLDAP_DEBUG_ACL\t\t%d\n",
|
|
LDAP_DEBUG_ACL );
|
|
printf( "\tLDAP_DEBUG_STATS\t%d\n",
|
|
LDAP_DEBUG_STATS );
|
|
printf( "\tLDAP_DEBUG_STATS2\t%d\n",
|
|
LDAP_DEBUG_STATS2 );
|
|
printf( "\tLDAP_DEBUG_SHELL\t%d\n",
|
|
LDAP_DEBUG_SHELL );
|
|
printf( "\tLDAP_DEBUG_PARSE\t%d\n",
|
|
LDAP_DEBUG_PARSE );
|
|
printf( "\tLDAP_DEBUG_ANY\t\t%d\n",
|
|
LDAP_DEBUG_ANY );
|
|
exit( 0 );
|
|
} else {
|
|
slap_debug |= atoi( optarg );
|
|
}
|
|
break;
|
|
#else
|
|
case 'd': /* turn on debugging */
|
|
fprintf( stderr,
|
|
"must compile with LDAP_DEBUG for debugging\n" );
|
|
break;
|
|
#endif
|
|
|
|
case 'f': /* read config file */
|
|
configfile = ch_strdup( optarg );
|
|
break;
|
|
|
|
case 'i': /* run from inetd */
|
|
inetd = 1;
|
|
break;
|
|
|
|
case 'p': { /* port on which to listen */
|
|
short port = (short)atoi( optarg );
|
|
if(! port ) {
|
|
fprintf(stderr, "-p %s must be numeric\n", optarg);
|
|
} else {
|
|
bind_addr.sin_port = htons(port);
|
|
}
|
|
} break;
|
|
|
|
case 's': /* set syslog level */
|
|
ldap_syslog = atoi( optarg );
|
|
break;
|
|
|
|
#ifdef LOG_LOCAL4
|
|
case 'l': /* set syslog local user */
|
|
syslogUser = cnvt_str2int( optarg, syslog_types,
|
|
DEFAULT_SYSLOG_USER );
|
|
break;
|
|
#endif
|
|
|
|
#ifdef LDAP_CONNECTIONLESS
|
|
case 'c': /* do connectionless (udp) */
|
|
udp = 1;
|
|
break;
|
|
#endif
|
|
|
|
#ifdef SLAPD_BDB2
|
|
case 't': /* timed server */
|
|
serverMode = SLAP_TIMEDSERVER_MODE;
|
|
break;
|
|
#endif
|
|
|
|
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
|
|
case 'u': /* user name */
|
|
if( username ) free(username);
|
|
username = ch_strdup( optarg );
|
|
break;
|
|
|
|
case 'g': /* group name */
|
|
if( groupname ) free(groupname);
|
|
groupname = ch_strdup( optarg );
|
|
break;
|
|
#endif /* SETUID && GETUID */
|
|
|
|
default:
|
|
usage( argv[0] );
|
|
exit( 1 );
|
|
}
|
|
}
|
|
|
|
ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
|
|
ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
|
|
ldif_debug = slap_debug;
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
|
|
|
|
if ( (serverName = strrchr( argv[0], '/' )) == NULL ) {
|
|
serverName = ch_strdup( argv[0] );
|
|
} else {
|
|
serverName = ch_strdup( serverName + 1 );
|
|
}
|
|
|
|
#ifdef LOG_LOCAL4
|
|
openlog( serverName, OPENLOG_OPTIONS, syslogUser );
|
|
#else
|
|
openlog( serverName, OPENLOG_OPTIONS );
|
|
#endif
|
|
|
|
tcps = set_socket( inetd ? NULL : &bind_addr );
|
|
|
|
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
|
|
if ( username != NULL || groupname != NULL )
|
|
slap_init_user( username, groupname );
|
|
#endif
|
|
|
|
if ( slap_init( serverMode, serverName ) != 0 ) {
|
|
rc = 1;
|
|
goto destroy;
|
|
}
|
|
|
|
if ( read_config( configfile ) != 0 ) {
|
|
rc = 1;
|
|
goto destroy;
|
|
}
|
|
|
|
(void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
|
|
(void) SIGNAL( LDAP_SIGUSR2, 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_SIGCHLD
|
|
(void) SIGNAL( LDAP_SIGCHLD, wait4child );
|
|
#endif
|
|
|
|
#ifndef WIN32
|
|
if(!inetd) {
|
|
#ifdef LDAP_DEBUG
|
|
lutil_detach( ldap_debug, 0 );
|
|
#else
|
|
lutil_detach( 0, 0 );
|
|
#endif
|
|
}
|
|
#endif /* WIN32 */
|
|
|
|
if ( slap_startup(-1) != 0 ) {
|
|
rc = 1;
|
|
goto shutdown;
|
|
}
|
|
|
|
if(!inetd) {
|
|
FILE *fp;
|
|
|
|
Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
|
|
|
|
if (( slapd_pid_file != NULL ) &&
|
|
(( fp = fopen( slapd_pid_file, "w" )) != NULL ))
|
|
{
|
|
fprintf( fp, "%d\n", (int) getpid() );
|
|
fclose( fp );
|
|
}
|
|
|
|
if (( slapd_args_file != NULL ) &&
|
|
(( fp = fopen( slapd_args_file, "w" )) != NULL ))
|
|
{
|
|
for ( i = 0; i < g_argc; i++ ) {
|
|
fprintf( fp, "%s ", g_argv[i] );
|
|
}
|
|
fprintf( fp, "\n" );
|
|
fclose( fp );
|
|
}
|
|
}
|
|
|
|
time( &starttime );
|
|
|
|
rc = slapd_daemon( inetd, tcps );
|
|
|
|
shutdown:
|
|
/* remember an error during shutdown */
|
|
rc |= slap_shutdown(-1);
|
|
destroy:
|
|
/* remember an error during destroy */
|
|
rc |= slap_destroy();
|
|
|
|
Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
|
|
|
|
closelog();
|
|
|
|
return rc;
|
|
}
|
|
|
|
|
|
#ifdef LDAP_SIGCHLD
|
|
|
|
/*
|
|
* Catch and discard terminated child processes, to avoid zombies.
|
|
*/
|
|
|
|
static RETSIGTYPE
|
|
wait4child( int sig )
|
|
{
|
|
int save_errno = errno;
|
|
|
|
#ifdef WNOHANG
|
|
errno = 0;
|
|
#ifdef HAVE_WAITPID
|
|
while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR )
|
|
; /* NULL */
|
|
#else
|
|
while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR )
|
|
; /* NULL */
|
|
#endif
|
|
#else
|
|
(void) wait( NULL );
|
|
#endif
|
|
(void) SIGNAL( sig, wait4child );
|
|
errno = save_errno;
|
|
}
|
|
|
|
#endif /* SIGCHLD || SIGCLD */
|
|
|
|
|
|
#ifdef LOG_LOCAL4
|
|
|
|
/*
|
|
* Convert a string to an integer by means of a dispatcher table
|
|
* if the string is not in the table return the default
|
|
*/
|
|
|
|
static int
|
|
cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal )
|
|
{
|
|
int retVal = defaultVal;
|
|
STRDISP_P disp;
|
|
|
|
for (disp = dispatcher; disp->stringVal; disp++) {
|
|
|
|
if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
|
|
|
|
retVal = disp->intVal;
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
return (retVal);
|
|
|
|
} /* cnvt_str2int */
|
|
|
|
#endif /* LOG_LOCAL4 */
|