]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/main.c
More ITS#6532: Support (:UUIDOrderingMatch:=foo)
[openldap] / servers / slapd / main.c
index 85f2eababaa6ddfb792366da64559a9f502ffeab..41d66907d9108d8f66d91b5a13a7b1c71e1fde50 100644 (file)
@@ -1,57 +1,95 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
+
 #include "portable.h"
 
 #include <stdio.h>
 
-#include <ac/signal.h>
+#include <ac/ctype.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 "ldap_defaults.h"
 #include "slap.h"
 #include "lutil.h"
+#include "ldif.h"
+
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif
 
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
 #define MAIN_RETURN(x) return
-struct sockaddr_in     bind_addr;
-
-/* in nt_main.c */
-extern SERVICE_STATUS                  SLAPDServiceStatus;
-extern SERVICE_STATUS_HANDLE   hSLAPDServiceStatus;
-extern ldap_pvt_thread_cond_t  started_event,          stopped_event;
-extern int       is_NT_Service;
-
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
-void LogSlapdStoppedEvent( char *svc );
-
-void CommenceStartupProcessing( LPCTSTR serviceName,
-                                                          void(*stopper)(int));
-void ReportSlapdShutdownComplete( void );
-void *getRegParam( char *svc, char *value );
-
-#define SERVICE_EXIT( e, n ) \
-               if ( is_NT_Service ) \
-{ \
-                       SLAPDServiceStatus.dwWin32ExitCode                              = e; \
-                       SLAPDServiceStatus.dwServiceSpecificExitCode    = n; \
-} 
+static struct sockaddr_in      bind_addr;
+
+#define SERVICE_EXIT( e, n )   do { \
+       if ( is_NT_Service ) { \
+               lutil_ServiceStatus.dwWin32ExitCode                             = (e); \
+               lutil_ServiceStatus.dwServiceSpecificExitCode   = (n); \
+       } \
+} while ( 0 )
+
 #else
 #define SERVICE_EXIT( e, n )
 #define MAIN_RETURN(x) return(x)
 #endif
 
+typedef int (MainFunc) LDAP_P(( int argc, char *argv[] ));
+extern MainFunc slapadd, slapcat, slapdn, slapindex, slappasswd,
+       slaptest, slapauth, slapacl, slapschema, slapmodify;
+
+static struct {
+       char *name;
+       MainFunc *func;
+} tools[] = {
+       {"slapadd", slapadd},
+       {"slapcat", slapcat},
+       {"slapdn", slapdn},
+       {"slapindex", slapindex},
+       {"slapmodify", slapmodify},
+       {"slappasswd", slappasswd},
+       {"slapschema", slapschema},
+       {"slaptest", slaptest},
+       {"slapauth", slapauth},
+       {"slapacl", slapacl},
+       /* NOTE: new tools must be added in chronological order,
+        * not in alphabetical order, because for backwards
+        * compatibility name[4] is used to identify the
+        * tools; so name[4]=='a' must refer to "slapadd" and
+        * not to "slapauth".  Alphabetical order can be used
+        * for tools whose name[4] is not used yet */
+       {NULL, NULL}
+};
+
 /*
  * 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
@@ -62,34 +100,208 @@ const char Versionstr[] =
        OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Server (slapd)";
 #endif
 
-#ifdef LOG_LOCAL4
+extern OverlayInit slap_oinfo[];
+extern BackendInfo slap_binfo[];
 
-#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 }
+#define        CHECK_NONE      0x00
+#define        CHECK_CONFIG    0x01
+#define        CHECK_LOGLEVEL  0x02
+static int check = CHECK_NONE;
+static int version = 0;
+
+void *slap_tls_ctx;
+LDAP *slap_tls_ld;
+
+static int
+slapd_opt_slp( const char *val, void *arg )
+{
+#ifdef HAVE_SLP
+       /* NULL is default */
+       if ( val == NULL || *val == '(' || strcasecmp( val, "on" ) == 0 ) {
+               slapd_register_slp = 1;
+               slapd_slp_attrs = (val != NULL && *val == '(') ? val : NULL;
+
+       } else if ( strcasecmp( val, "off" ) == 0 ) {
+               slapd_register_slp = 0;
+
+       /* NOTE: add support for URL specification? */
+
+       } else {
+               fprintf(stderr, "unrecognized value \"%s\" for SLP option\n", val );
+               return -1;
+       }
+
+       return 0;
+               
+#else
+       fputs( "slapd: SLP support is not available\n", stderr );
+       return 0;
+#endif
+}
+
+/*
+ * Option helper structure:
+ * 
+ * oh_nam      is left-hand part of <option>[=<value>]
+ * oh_fnc      is handler function
+ * oh_arg      is an optional arg to oh_fnc
+ * oh_usage    is the one-line usage string related to the option,
+ *             which is assumed to start with <option>[=<value>]
+ *
+ * please leave valid options in the structure, and optionally #ifdef
+ * their processing inside the helper, so that reasonable and helpful
+ * error messages can be generated if a disabled option is requested.
+ */
+struct option_helper {
+       struct berval   oh_name;
+       int             (*oh_fnc)(const char *val, void *arg);
+       void            *oh_arg;
+       const char      *oh_usage;
+} option_helpers[] = {
+       { BER_BVC("slp"),       slapd_opt_slp,  NULL, "slp[={on|off|(attrs)}] enable/disable SLP using (attrs)" },
+       { BER_BVNULL, 0, NULL, NULL }
 };
 
-static int   cnvt_str2int( char *, STRDISP_P, int );
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
+#ifdef LOG_LOCAL4
+int
+parse_syslog_user( const char *arg, int *syslogUser )
+{
+       static slap_verbmasks syslogUsers[] = {
+               { BER_BVC( "LOCAL0" ), LOG_LOCAL0 },
+               { BER_BVC( "LOCAL1" ), LOG_LOCAL1 },
+               { BER_BVC( "LOCAL2" ), LOG_LOCAL2 },
+               { BER_BVC( "LOCAL3" ), LOG_LOCAL3 },
+               { BER_BVC( "LOCAL4" ), LOG_LOCAL4 },
+               { BER_BVC( "LOCAL5" ), LOG_LOCAL5 },
+               { BER_BVC( "LOCAL6" ), LOG_LOCAL6 },
+               { BER_BVC( "LOCAL7" ), LOG_LOCAL7 },
+#ifdef LOG_USER
+               { BER_BVC( "USER" ), LOG_USER },
+#endif /* LOG_USER */
+#ifdef LOG_DAEMON
+               { BER_BVC( "DAEMON" ), LOG_DAEMON },
+#endif /* LOG_DAEMON */
+               { BER_BVNULL, 0 }
+       };
+       int i = verb_to_mask( arg, syslogUsers );
+
+       if ( BER_BVISNULL( &syslogUsers[ i ].word ) ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "unrecognized syslog user \"%s\".\n",
+                       arg, 0, 0 );
+               return 1;
+       }
+
+       *syslogUser = syslogUsers[ i ].mask;
+
+       return 0;
+}
+#endif /* LOG_LOCAL4 */
+
+int
+parse_syslog_level( const char *arg, int *levelp )
+{
+       static slap_verbmasks   str2syslog_level[] = {
+               { BER_BVC( "EMERG" ),   LOG_EMERG },
+               { BER_BVC( "ALERT" ),   LOG_ALERT },
+               { BER_BVC( "CRIT" ),    LOG_CRIT },
+               { BER_BVC( "ERR" ),     LOG_ERR },
+               { BER_BVC( "WARNING" ), LOG_WARNING },
+               { BER_BVC( "NOTICE" ),  LOG_NOTICE },
+               { BER_BVC( "INFO" ),    LOG_INFO },
+               { BER_BVC( "DEBUG" ),   LOG_DEBUG },
+               { BER_BVNULL, 0 }
+       };
+       int i = verb_to_mask( arg, str2syslog_level );
+       if ( BER_BVISNULL( &str2syslog_level[ i ].word ) ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "unknown syslog level \"%s\".\n",
+                       arg, 0, 0 );
+               return 1;
+       }
+       
+       *levelp = str2syslog_level[ i ].mask;
+
+       return 0;
+}
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
+
+int
+parse_debug_unknowns( char **unknowns, int *levelp )
+{
+       int i, level, rc = 0;
 
-#endif  /* LOG_LOCAL4 */
+       for ( i = 0; unknowns[ i ] != NULL; i++ ) {
+               level = 0;
+               if ( str2loglevel( unknowns[ i ], &level )) {
+                       fprintf( stderr,
+                               "unrecognized log level \"%s\"\n", unknowns[ i ] );
+                       rc = 1;
+               } else {
+                       *levelp |= level;
+               }
+       }
+       return rc;
+}
 
+int
+parse_debug_level( const char *arg, int *levelp, char ***unknowns )
+{
+       int     level;
+
+       if ( arg && arg[ 0 ] != '-' && !isdigit( (unsigned char) arg[ 0 ] ) )
+       {
+               int     i;
+               char    **levels;
+
+               levels = ldap_str2charray( arg, "," );
+
+               for ( i = 0; levels[ i ] != NULL; i++ ) {
+                       level = 0;
+
+                       if ( str2loglevel( levels[ i ], &level ) ) {
+                               /* remember this for later */
+                               ldap_charray_add( unknowns, levels[ i ] );
+                               fprintf( stderr,
+                                       "unrecognized log level \"%s\" (deferred)\n",
+                                       levels[ i ] );
+                       } else {
+                               *levelp |= level;
+                       }
+               }
+
+               ldap_charray_free( levels );
+
+       } else {
+               int rc;
+
+               if ( arg[0] == '-' ) {
+                       rc = lutil_atoix( &level, arg, 0 );
+               } else {
+                       unsigned ulevel;
+
+                       rc = lutil_atoux( &ulevel, arg, 0 );
+                       level = (int)ulevel;
+               }
+
+               if ( rc ) {
+                       fprintf( stderr,
+                               "unrecognized log level "
+                               "\"%s\"\n", arg );
+                       return 1;
+               }
+
+               if ( level == 0 ) {
+                       *levelp = 0;
+
+               } else {
+                       *levelp |= level;
+               }
+       }
+
+       return 0;
+}
 
 static void
 usage( char *name )
@@ -97,192 +309,307 @@ usage( char *name )
        fprintf( stderr,
                "usage: %s options\n", name );
        fprintf( stderr,
-#if LDAP_CONNECTIONLESS
-               "\t-c\t\tEnable (experimental) Connectionless LDAP\n"
-#endif
-               "\t-d level\tDebug Level" "\n"
-               "\t-f filename\tConfiguration File\n"
+               "\t-4\t\tIPv4 only\n"
+               "\t-6\t\tIPv6 only\n"
+               "\t-T {acl|add|auth|cat|dn|index|modify|passwd|test}\n"
+               "\t\t\tRun in Tool mode\n"
+               "\t-c cookie\tSync cookie of consumer\n"
+               "\t-d level\tDebug level" "\n"
+               "\t-f filename\tConfiguration file\n"
+               "\t-F dir\tConfiguration directory\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-               "\t-g group\tGroup (id or name) to ran as\n"
+               "\t-g group\tGroup (id or name) to run as\n"
 #endif
-               "\t-h URLs\tList of URLs to serve\n"
-#ifdef LOG_LOCAL4
-               "\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
-#endif
-#ifdef HAVE_WINSOCK
-               "\t-n NTserviceName\tNT service name\n"
-#endif
-
-               "\t-p port\tLDAP Port\n"
-#ifdef HAVE_TLS
-               "\t-P port\tLDAP over TLS Port\n"
+               "\t-h URLs\t\tList of URLs to serve\n"
+#ifdef SLAP_DEFAULT_SYSLOG_USER
+               "\t-l facility\tSyslog facility (default: LOCAL4)\n"
 #endif
-               "\t-s level\tSyslog Level\n"
-#ifdef SLAPD_BDB2
-               "\t-t\t\tEnable BDB2 timing\n"
+               "\t-n serverName\tService name\n"
+               "\t-o <opt>[=val] generic means to specify options" );
+       if ( !BER_BVISNULL( &option_helpers[0].oh_name ) ) {
+               int     i;
+
+               fprintf( stderr, "; supported options:\n" );
+               for ( i = 0; !BER_BVISNULL( &option_helpers[i].oh_name ); i++) {
+                       fprintf( stderr, "\t\t%s\n", option_helpers[i].oh_usage );
+               }
+       } else {
+               fprintf( stderr, "\n" );
+       }
+       fprintf( stderr,        
+#ifdef HAVE_CHROOT
+               "\t-r directory\tSandbox directory to chroot to\n"
 #endif
+               "\t-s level\tSyslog level\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-               "\t-u user\tUser (id or name) to ran as\n"
+               "\t-u user\t\tUser (id or name) to run as\n"
 #endif
+               "\t-V\t\tprint version info (-VV exit afterwards, -VVV print\n"
+               "\t\t\tinfo about static overlays and backends)\n"
     );
 }
 
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
 #else
 int main( int argc, char **argv )
 #endif
 {
-       int             i;
-       int             rc;
+       int             i, no_detach = 0;
+       int             rc = 1;
        char *urls = NULL;
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
        char *username = NULL;
        char *groupname = NULL;
 #endif
-#ifdef LOG_LOCAL4
-    int     syslogUser = DEFAULT_SYSLOG_USER;
+#if defined(HAVE_CHROOT)
+       char *sandbox = NULL;
 #endif
-#ifdef HAVE_WINSOCK
-       char        *NTservice  = SERVICE_NAME;
-       char            *configfile = ".\\slapd.conf";
-#else
-       char            *configfile = SLAPD_DEFAULT_CONFIGFILE;
+#ifdef SLAP_DEFAULT_SYSLOG_USER
+       int syslogUser = SLAP_DEFAULT_SYSLOG_USER;
 #endif
-       char        *serverName;
-       int         serverMode = SLAP_SERVER_MODE;
+       
+       int g_argc = argc;
+       char **g_argv = argv;
 
-       int port = LDAP_PORT;
-#ifdef HAVE_TLS
-       int tls_port = LDAPS_PORT;
-#else
-       int tls_port = 0;
+       char *configfile = NULL;
+       char *configdir = NULL;
+       char *serverName;
+       int serverMode = SLAP_SERVER_MODE;
+
+       struct sync_cookie *scp = NULL;
+       struct sync_cookie *scp_entry = NULL;
+
+       char **debug_unknowns = NULL;
+       char **syslog_unknowns = NULL;
+
+       char *serverNamePrefix = "";
+       size_t  l;
+
+       int slapd_pid_file_unlink = 0, slapd_args_file_unlink = 0;
+       int firstopt = 1;
+
+#ifdef CSRIMALLOC
+       FILE *leakfile;
+       if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
+               leakfile = stderr;
+       }
 #endif
 
-       g_argc = argc;
-       g_argv = argv;
+       slap_sl_mem_init();
+
+       (void) ldap_pvt_thread_initialize();
 
-#ifdef HAVE_WINSOCK
+       serverName = lutil_progname( "slapd", argc, argv );
+
+       if ( strcmp( serverName, "slapd" ) ) {
+               for (i=0; tools[i].name; i++) {
+                       if ( !strcmp( serverName, tools[i].name ) ) {
+                               rc = tools[i].func(argc, argv);
+                               MAIN_RETURN(rc);
+                       }
+               }
+       }
+
+#ifdef HAVE_NT_SERVICE_MANAGER
        {
-               int *i;
+               int *ip;
                char *newConfigFile;
-               if ( is_NT_Service ) CommenceStartupProcessing( NTservice, slap_set_shutdown );
-               i = (int*)getRegParam( NULL, "Port" );
-               if ( i != NULL )
-               {
-                       port = *i;
-                       Debug ( LDAP_DEBUG_ANY, "new port from registry is: %d\n", port, 0, 0 );
+               char *newConfigDir;
+               char *newUrls;
+               char *regService = NULL;
+
+               if ( is_NT_Service ) {
+                       lutil_CommenceStartupProcessing( serverName, slap_sig_shutdown );
+                       if ( strcmp(serverName, SERVICE_NAME) )
+                           regService = serverName;
                }
-#ifdef HAVE_TLS
-               i = (int*)getRegParam( NULL, "TLSPort" );
-               if ( i != NULL )
-               {
-                       tls_port = *i;
-                       Debug ( LDAP_DEBUG_ANY, "new TLS port from registry is: %d\n", tls_port, 0, 0 );
+
+               ip = (int*)lutil_getRegParam( regService, "DebugLevel" );
+               if ( ip != NULL ) {
+                       slap_debug = *ip;
+                       Debug( LDAP_DEBUG_ANY,
+                               "new debug level from registry is: %d\n", slap_debug, 0, 0 );
                }
-#endif
-               i = (int*)getRegParam( NULL, "DebugLevel" );
-               if ( i != NULL ) 
-               {
-                       slap_debug = *i;
-                       Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
+
+               newUrls = (char *) lutil_getRegParam(regService, "Urls");
+               if (newUrls) {
+                   if (urls)
+                       ch_free(urls);
+
+                   urls = ch_strdup(newUrls);
+                   Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n",
+                               urls, 0, 0);
                }
-               newConfigFile = (char*)getRegParam( NULL, "ConfigFile" );
-               if ( newConfigFile != NULL ) 
-               {
+
+               newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
+               if ( newConfigFile != NULL ) {
                        configfile = newConfigFile;
                        Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
                }
+
+               newConfigDir = (char*)lutil_getRegParam( regService, "ConfigDir" );
+               if ( newConfigDir != NULL ) {
+                       configdir = newConfigDir;
+                       Debug ( LDAP_DEBUG_ANY, "new config dir from registry is: %s\n", configdir, 0, 0 );
+               }
        }
 #endif
 
        while ( (i = getopt( argc, argv,
-                            "d:f:h:p:s:u"
-#ifdef LOG_LOCAL4
-                            "l:"
+                            "c:d:f:F:h:n:o:s:tT:V"
+#ifdef LDAP_PF_INET6
+                               "46"
 #endif
-#ifdef SLAPD_BDB2
-                            "t"
+#ifdef HAVE_CHROOT
+                               "r:"
 #endif
-#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-                            "u:g:"
-#endif
-#ifdef LDAP_CONNECTIONLESS
-                                "c"
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
+                               "S:"
+#ifdef LOG_LOCAL4
+                               "l:"
 #endif
-#ifdef HAVE_WINSOCK
-                                "n:"
 #endif
-#ifdef HAVE_TLS
-                            "P:"
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+                               "u:g:"
 #endif
                             )) != EOF ) {
                switch ( i ) {
+#ifdef LDAP_PF_INET6
+               case '4':
+                       slap_inet4or6 = AF_INET;
+                       break;
+               case '6':
+                       slap_inet4or6 = AF_INET6;
+                       break;
+#endif
+
                case 'h':       /* listen URLs */
+                       if ( urls != NULL ) free( urls );
                        urls = ch_strdup( optarg );
-            break;
+                       break;
 
-#ifdef LDAP_DEBUG
-               case 'd':       /* turn on debugging */
-                       slap_debug |= atoi( optarg );
+               case 'c':       /* provide sync cookie, override if exist in replica */
+                       scp = (struct sync_cookie *) ch_calloc( 1,
+                                                                               sizeof( struct sync_cookie ));
+                       ber_str2bv( optarg, 0, 1, &scp->octet_str );
+                       
+                       /* This only parses out the rid at this point */
+                       slap_parse_sync_cookie( scp, NULL );
+
+                       if ( scp->rid == -1 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                               "main: invalid cookie \"%s\"\n",
+                                               optarg, 0, 0 );
+                               slap_sync_cookie_free( scp, 1 );
+                               goto destroy;
+                       }
+
+                       LDAP_STAILQ_FOREACH( scp_entry, &slap_sync_cookie, sc_next ) {
+                               if ( scp->rid == scp_entry->rid ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                                   "main: duplicated replica id in cookies\n",
+                                                       0, 0, 0 );
+                                       slap_sync_cookie_free( scp, 1 );
+                                       goto destroy;
+                               }
+                       }
+                       LDAP_STAILQ_INSERT_TAIL( &slap_sync_cookie, scp, sc_next );
                        break;
+
+               case 'd': {     /* set debug level and 'do not detach' flag */
+                       int     level = 0;
+
+                       if ( strcmp( optarg, "?" ) == 0 ) {
+                               check |= CHECK_LOGLEVEL;
+                               break;
+                       }
+
+                       no_detach = 1;
+                       if ( parse_debug_level( optarg, &level, &debug_unknowns ) ) {
+                               goto destroy;
+                       }
+#ifdef LDAP_DEBUG
+                       slap_debug |= level;
 #else
-               case 'd':       /* turn on debugging */
-                       fprintf( stderr,
-                           "must compile with LDAP_DEBUG for debugging\n" );
-                       break;
+                       if ( level != 0 )
+                               fputs( "must compile with LDAP_DEBUG for debugging\n",
+                                      stderr );
 #endif
+                       } break;
 
                case 'f':       /* read config file */
                        configfile = ch_strdup( optarg );
                        break;
 
-               case 'p': {     /* port on which to listen */
-                               int p = atoi( optarg );
-                               if(! p ) {
-                                       fprintf(stderr, "-p %s must be numeric\n", optarg);
-                               } else if( p < 0 || p >= 1<<16) {
-                                       fprintf(stderr, "-p %s invalid\n", optarg);
-                               } else {
-                                       port = p;
-                               }
-                       } break;
+               case 'F':       /* use config dir */
+                       configdir = ch_strdup( optarg );
+                       break;
 
-#ifdef HAVE_TLS
-               case 'P': {     /* port on which to listen for TLS */
-                               int p = atoi( optarg );
-                               if(! p ) {
-                                       fprintf(stderr, "-P %s must be numeric\n", optarg);
-                               } else if( p < 0 || p >= 1<<16) {
-                                       fprintf(stderr, "-P %s invalid\n", optarg);
-                               } else {
-                                       tls_port = p;
+               case 'o': {
+                       char            *val = strchr( optarg, '=' );
+                       struct berval   opt;
+
+                       opt.bv_val = optarg;
+                       
+                       if ( val ) {
+                               opt.bv_len = ( val - optarg );
+                               val++;
+                       
+                       } else {
+                               opt.bv_len = strlen( optarg );
+                       }
+
+                       for ( i = 0; !BER_BVISNULL( &option_helpers[i].oh_name ); i++ ) {
+                               if ( ber_bvstrcasecmp( &option_helpers[i].oh_name, &opt ) == 0 ) {
+                                       assert( option_helpers[i].oh_fnc != NULL );
+                                       if ( (*option_helpers[i].oh_fnc)( val, option_helpers[i].oh_arg ) == -1 ) {
+                                               /* we assume the option parsing helper
+                                                * issues appropriate and self-explanatory
+                                                * error messages... */
+                                               goto stop;
+                                       }
+                                       break;
                                }
-                       } break;
-#endif
+                       }
+
+                       if ( BER_BVISNULL( &option_helpers[i].oh_name ) ) {
+                               goto unhandled_option;
+                       }
+                       break;
+               }
 
                case 's':       /* set syslog level */
-                       ldap_syslog = atoi( optarg );
+                       if ( strcmp( optarg, "?" ) == 0 ) {
+                               check |= CHECK_LOGLEVEL;
+                               break;
+                       }
+
+                       if ( parse_debug_level( optarg, &ldap_syslog, &syslog_unknowns ) ) {
+                               goto destroy;
+                       }
                        break;
 
-#ifdef LOG_LOCAL4
-               case 'l':       /* set syslog local user */
-                       syslogUser = cnvt_str2int( optarg,
-                               syslog_types, DEFAULT_SYSLOG_USER );
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
+               case 'S':
+                       if ( parse_syslog_level( optarg, &ldap_syslog_level ) ) {
+                               goto destroy;
+                       }
                        break;
-#endif
 
-#ifdef LDAP_CONNECTIONLESS
-               case 'c':       /* do connectionless (udp) */
-                       /* udp = 1; */
-                       fprintf( stderr, "connectionless support not supported");
-                       exit( EXIT_FAILURE );
+#ifdef LOG_LOCAL4
+               case 'l':       /* set syslog local user */
+                       if ( parse_syslog_user( optarg, &syslogUser ) ) {
+                               goto destroy;
+                       }
                        break;
 #endif
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
-#ifdef SLAPD_BDB2
-               case 't':  /* timed server */
-                       serverMode = SLAP_TIMEDSERVER_MODE;
+#ifdef HAVE_CHROOT
+               case 'r':
+                       if( sandbox ) free(sandbox);
+                       sandbox = ch_strdup( optarg );
                        break;
 #endif
 
@@ -298,128 +625,365 @@ int main( int argc, char **argv )
                        break;
 #endif /* SETUID && GETUID */
 
-#ifdef HAVE_WINSOCK
                case 'n':  /* NT service name */
-                       NTservice = ch_strdup( optarg );
+                       serverName = ch_strdup( optarg );
                        break;
-#endif
+
+               case 't':
+                       /* deprecated; use slaptest instead */
+                       fprintf( stderr, "option -t deprecated; "
+                               "use slaptest command instead\n" );
+                       check |= CHECK_CONFIG;
+                       break;
+
+               case 'V':
+                       version++;
+                       break;
+
+               case 'T':
+                       if ( firstopt == 0 ) {
+                               fprintf( stderr, "warning: \"-T %s\" "
+                                       "should be the first option.\n",
+                                       optarg );
+                       }
+
+                       /* try full option string first */
+                       for ( i = 0; tools[i].name; i++ ) {
+                               if ( strcmp( optarg, &tools[i].name[4] ) == 0 ) {
+                                       rc = tools[i].func( argc, argv );
+                                       MAIN_RETURN( rc );
+                               }
+                       }
+
+                       /* try bits of option string (backward compatibility for single char) */
+                       l = strlen( optarg );
+                       for ( i = 0; tools[i].name; i++ ) {
+                               if ( strncmp( optarg, &tools[i].name[4], l ) == 0 ) {
+                                       rc = tools[i].func( argc, argv );
+                                       MAIN_RETURN( rc );
+                               }
+                       }
+                       
+                       /* issue error */
+                       serverName = optarg;
+                       serverNamePrefix = "slap";
+                       fprintf( stderr, "program name \"%s%s\" unrecognized; "
+                                       "aborting...\n", serverNamePrefix, serverName );
+                       /* FALLTHRU */
                default:
+unhandled_option:;
                        usage( argv[0] );
                        rc = 1;
                        SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 15 );
                        goto stop;
                }
+
+               if ( firstopt ) {
+                       firstopt = 0;
+               }
        }
 
+       if ( optind != argc )
+               goto unhandled_option;
+
        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 ( version ) {
+               fprintf( stderr, "%s\n", Versionstr );
+               if ( version > 2 ) {
+                       if ( slap_oinfo[0].ov_type ) {
+                               fprintf( stderr, "Included static overlays:\n");
+                               for ( i= 0 ; slap_oinfo[i].ov_type; i++ ) {
+                                       fprintf( stderr, "    %s\n", slap_oinfo[i].ov_type );
+                               }
+                       }
+                       if ( slap_binfo[0].bi_type ) {
+                               fprintf( stderr, "Included static backends:\n");
+                               for ( i= 0 ; slap_binfo[i].bi_type; i++ ) {
+                                       fprintf( stderr, "    %s\n", slap_binfo[i].bi_type );
+                               }
+                       }
+               }
 
-       if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
-               serverName = ch_strdup( argv[0] );
-       } else {
-               serverName = ch_strdup( serverName + 1 );
+               if ( version > 1 ) goto stop;
        }
 
-#ifdef LOG_LOCAL4
-       openlog( serverName, OPENLOG_OPTIONS, syslogUser );
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
+       {
+               char *logName;
+#ifdef HAVE_EBCDIC
+               logName = ch_strdup( serverName );
+               __atoe( logName );
 #else
-       openlog( serverName, OPENLOG_OPTIONS );
+               logName = serverName;
+#endif
+
+#ifdef LOG_LOCAL4
+               openlog( logName, OPENLOG_OPTIONS, syslogUser );
+#elif defined LOG_DEBUG
+               openlog( logName, OPENLOG_OPTIONS );
 #endif
+#ifdef HAVE_EBCDIC
+               free( logName );
+#endif
+       }
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
+
+       Debug( LDAP_DEBUG_ANY, "%s", Versionstr, 0, 0 );
+
+       global_host = ldap_pvt_get_fqdn( NULL );
+       ber_str2bv( global_host, 0, 0, &global_host_bv );
 
-       if( slapd_daemon_init( urls, port, tls_port ) != 0 ) {
+       if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
                goto stop;
        }
 
+#if defined(HAVE_CHROOT)
+       if ( sandbox ) {
+               if ( chdir( sandbox ) ) {
+                       perror("chdir");
+                       rc = 1;
+                       goto stop;
+               }
+               if ( chroot( sandbox ) ) {
+                       perror("chroot");
+                       rc = 1;
+                       goto stop;
+               }
+       }
+#endif
+
 #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;
+       extops_init();
+       lutil_passwd_init();
+
+#ifdef HAVE_TLS
+       rc = ldap_create( &slap_tls_ld );
+       if ( rc ) {
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+               goto destroy;
+       }
+       /* Library defaults to full certificate checking. This is correct when
+        * a client is verifying a server because all servers should have a
+        * valid cert. But few clients have valid certs, so we want our default
+        * to be no checking. The config file can override this as usual.
+        */
+       rc = LDAP_OPT_X_TLS_NEVER;
+       (void) ldap_pvt_tls_set_option( slap_tls_ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
+#endif
+
+       rc = slap_init( serverMode, serverName );
+       if ( rc ) {
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
                goto destroy;
        }
 
-       if ( read_config( configfile ) != 0 ) {
+       if ( read_config( configfile, configdir ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
+
+               if ( check & CHECK_CONFIG ) {
+                       fprintf( stderr, "config check failed\n" );
+               }
+
+               goto destroy;
+       }
+
+       if ( debug_unknowns ) {
+               rc = parse_debug_unknowns( debug_unknowns, &slap_debug );
+               ldap_charray_free( debug_unknowns );
+               debug_unknowns = NULL;
+               if ( rc )
+                       goto destroy;
+       }
+       if ( syslog_unknowns ) {
+               rc = parse_debug_unknowns( syslog_unknowns, &ldap_syslog );
+               ldap_charray_free( syslog_unknowns );
+               syslog_unknowns = NULL;
+               if ( rc )
+                       goto destroy;
+       }       
+
+       if ( check & CHECK_LOGLEVEL ) {
+               rc = 0;
+               goto destroy;
+       }
+
+       if ( check & CHECK_CONFIG ) {
+               fprintf( stderr, "config check succeeded\n" );
+
+               check &= ~CHECK_CONFIG;
+               if ( check == CHECK_NONE ) {
+                       rc = 0;
+                       goto destroy;
+               }
+       }
+
+       if ( glue_sub_attach( 0 ) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                   "subordinate config error\n",
+                   0, 0, 0 );
+
+               goto destroy;
+       }
+
+       if ( slap_schema_check( ) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                   "schema prep error\n",
+                   0, 0, 0 );
+
                goto destroy;
        }
 
 #ifdef HAVE_TLS
-       ldap_pvt_tls_init();
-       ldap_pvt_tls_init_def_ctx();
+       rc = ldap_pvt_tls_init();
+       if( rc != 0) {
+               Debug( LDAP_DEBUG_ANY,
+                   "main: TLS init failed: %d\n",
+                   0, 0, 0 );
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+               goto destroy;
+       }
+
+       {
+               int opt = 1;
+
+               /* Force new ctx to be created */
+               rc = ldap_pvt_tls_set_option( slap_tls_ld, LDAP_OPT_X_TLS_NEWCTX, &opt );
+               if( rc == 0 ) {
+                       /* The ctx's refcount is bumped up here */
+                       ldap_pvt_tls_get_option( slap_tls_ld, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx );
+                       load_extop( &slap_EXOP_START_TLS, 0, starttls_extop );
+               } else if ( rc != LDAP_NOT_SUPPORTED ) {
+                       Debug( LDAP_DEBUG_ANY,
+                           "main: TLS init def ctx failed: %d\n",
+                           rc, 0, 0 );
+                       rc = 1;
+                       SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+                       goto destroy;
+               }
+       }
 #endif
 
-       (void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
-       (void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown );
+#ifdef HAVE_CYRUS_SASL
+       if( sasl_host == NULL ) {
+               sasl_host = ch_strdup( global_host );
+       }
+#endif
+
+       (void) SIGNAL( LDAP_SIGUSR1, slap_sig_wake );
+       (void) SIGNAL( LDAP_SIGUSR2, slap_sig_shutdown );
+
 #ifdef SIGPIPE
        (void) SIGNAL( SIGPIPE, SIG_IGN );
 #endif
 #ifdef SIGHUP
-       (void) SIGNAL( SIGHUP, slap_set_shutdown );
+       (void) SIGNAL( SIGHUP, slap_sig_shutdown );
+#endif
+       (void) SIGNAL( SIGINT, slap_sig_shutdown );
+       (void) SIGNAL( SIGTERM, slap_sig_shutdown );
+#ifdef SIGTRAP
+       (void) SIGNAL( SIGTRAP, slap_sig_shutdown );
 #endif
-       (void) SIGNAL( SIGINT, slap_set_shutdown );
-       (void) SIGNAL( SIGTERM, slap_set_shutdown );
 #ifdef LDAP_SIGCHLD
        (void) SIGNAL( LDAP_SIGCHLD, wait4child );
 #endif
 #ifdef SIGBREAK
        /* SIGBREAK is generated when Ctrl-Break is pressed. */
-       (void) SIGNAL( SIGBREAK, slap_set_shutdown );
+       (void) SIGNAL( SIGBREAK, slap_sig_shutdown );
 #endif
 
 #ifndef HAVE_WINSOCK
-#ifdef LDAP_DEBUG
-               lutil_detach( ldap_debug, 0 );
-#else
-               lutil_detach( 0, 0 );
-#endif
+       lutil_detach( no_detach, 0 );
 #endif /* HAVE_WINSOCK */
 
-       if ( slap_startup(-1)  != 0 ) {
-               rc = 1;
-               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
-               goto shutdown;
+#ifdef CSRIMALLOC
+       mal_leaktrace(1);
+#endif
+
+       if ( slapd_pid_file != NULL ) {
+               FILE *fp = fopen( slapd_pid_file, "w" );
+
+               if ( fp == NULL ) {
+                       int save_errno = errno;
+
+                       Debug( LDAP_DEBUG_ANY, "unable to open pid file "
+                               "\"%s\": %d (%s)\n",
+                               slapd_pid_file,
+                               save_errno, strerror( save_errno ) );
+
+                       free( slapd_pid_file );
+                       slapd_pid_file = NULL;
+
+                       rc = 1;
+                       goto destroy;
+               }
+               fprintf( fp, "%d\n", (int) getpid() );
+               fclose( fp );
+               slapd_pid_file_unlink = 1;
        }
 
-       {
-               FILE *fp;
+       if ( slapd_args_file != NULL ) {
+               FILE *fp = fopen( slapd_args_file, "w" );
 
-               Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+               if ( fp == NULL ) {
+                       int save_errno = errno;
 
-               if (( slapd_pid_file != NULL ) &&
-                       (( fp = fopen( slapd_pid_file, "w" )) != NULL ))
-               {
-                       fprintf( fp, "%d\n", (int) getpid() );
-                       fclose( fp );
+                       Debug( LDAP_DEBUG_ANY, "unable to open args file "
+                               "\"%s\": %d (%s)\n",
+                               slapd_args_file,
+                               save_errno, strerror( save_errno ) );
+
+                       free( slapd_args_file );
+                       slapd_args_file = NULL;
+
+                       rc = 1;
+                       goto destroy;
                }
 
-               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 );
+               for ( i = 0; i < g_argc; i++ ) {
+                       fprintf( fp, "%s ", g_argv[i] );
                }
+               fprintf( fp, "\n" );
+               fclose( fp );
+               slapd_args_file_unlink = 1;
+       }
+
+       /*
+        * FIXME: moved here from slapd_daemon_task()
+        * because back-monitor db_open() needs it
+        */
+       time( &starttime );
+
+       connections_init();
+
+       if ( slap_startup( NULL ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
+               goto shutdown;
        }
 
-#ifdef HAVE_WINSOCK
-       LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls );
+       Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
+
+#ifdef HAVE_NT_EVENT_LOG
+       if (is_NT_Service)
+       lutil_LogStartedEvent( serverName, slap_debug, configfile ?
+               configfile : SLAPD_DEFAULT_CONFIGFILE , urls );
 #endif
 
        rc = slapd_daemon();
 
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
        /* Throw away the event that we used during the startup process. */
        if ( is_NT_Service )
                ldap_pvt_thread_cond_destroy( &started_event );
@@ -427,25 +991,91 @@ int main( int argc, char **argv )
 
 shutdown:
        /* remember an error during shutdown */
-       rc |= slap_shutdown(-1);
+       rc |= slap_shutdown( NULL );
+
 destroy:
+       if ( check & CHECK_LOGLEVEL ) {
+               (void)loglevel_print( stdout );
+       }
        /* remember an error during destroy */
        rc |= slap_destroy();
 
+       while ( !LDAP_STAILQ_EMPTY( &slap_sync_cookie )) {
+               scp = LDAP_STAILQ_FIRST( &slap_sync_cookie );
+               LDAP_STAILQ_REMOVE_HEAD( &slap_sync_cookie, sc_next );
+               ch_free( scp );
+       }
+
+#ifdef SLAPD_MODULES
+       module_kill();
+#endif
+
+       extops_kill();
+
+       supported_feature_destroy();
+       entry_info_destroy();
+
 stop:
-#ifdef HAVE_WINSOCK
-       LogSlapdStoppedEvent( NTservice );
+#ifdef HAVE_NT_EVENT_LOG
+       if (is_NT_Service)
+       lutil_LogStoppedEvent( serverName );
 #endif
 
        Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
 
-#ifdef HAVE_WINSOCK
-       ReportSlapdShutdownComplete();
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+       lutil_ReportShutdownComplete();
 #endif
 
+#ifdef LOG_DEBUG
     closelog();
+#endif
        slapd_daemon_destroy();
 
+       controls_destroy();
+
+       filter_destroy();
+
+       schema_destroy();
+
+       lutil_passwd_destroy();
+
+#ifdef HAVE_TLS
+       if ( slap_tls_ld ) {
+               ldap_pvt_tls_ctx_free( slap_tls_ctx );
+               ldap_unbind_ext( slap_tls_ld, NULL, NULL );
+       }
+       ldap_pvt_tls_destroy();
+#endif
+
+       slap_sasl_regexp_destroy();
+
+       if ( slapd_pid_file_unlink ) {
+               unlink( slapd_pid_file );
+       }
+       if ( slapd_args_file_unlink ) {
+               unlink( slapd_args_file );
+       }
+
+       config_destroy();
+
+       if ( configfile )
+               ch_free( configfile );
+       if ( configdir )
+               ch_free( configdir );
+       if ( urls )
+               ch_free( urls );
+       if ( global_host )
+               ch_free( global_host );
+
+       /* kludge, get symbols referenced */
+       tavl_free( NULL, NULL );
+
+#ifdef CSRIMALLOC
+       mal_dumpleaktrace( leakfile );
+#endif
+
        MAIN_RETURN(rc);
 }
 
@@ -462,48 +1092,18 @@ wait4child( int sig )
     int save_errno = errno;
 
 #ifdef WNOHANG
-    errno = 0;
+    do
+        errno = 0;
 #ifdef HAVE_WAITPID
-    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR )
-       ;       /* NULL */
+    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR );
 #else
-    while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR )
-       ;       /* NULL */
+    while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR );
 #endif
 #else
     (void) wait( NULL );
 #endif
-    (void) SIGNAL( sig, wait4child );
+    (void) SIGNAL_REINSTALL( 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);
-}
-
-#endif  /* LOG_LOCAL4 */
+#endif /* LDAP_SIGCHLD */