ITS#3353 consolidate slapd globals into a single struct

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 3f5f835d0e61e8e07a9a338b4a83fae4dc5602db..0270b05bfa77055f493346cb219eb3d90313e8b0 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -133,18 +133,16 @@ static int cnvt_str2int( char *, STRDISP_P, int );
 static int check = CHECK_NONE;
 static int version = 0;
 
-void *slap_tls_ctx;
-
 static int
 slapd_opt_slp( const char *val, void *arg )
 {
 #ifdef HAVE_SLP
        /* NULL is default */
        if ( val == NULL || strcasecmp( val, "on" ) == 0 ) {
-               slapd_register_slp = 1;
+               SLAPD_GLOBAL(register_slp) = 1;
 
        } else if ( strcasecmp( val, "off" ) == 0 ) {
-               slapd_register_slp = 0;
+               SLAPD_GLOBAL(register_slp) = 0;
 
        /* NOTE: add support for URL specification? */
 
@@ -274,6 +272,8 @@ int main( int argc, char **argv )
 
        slap_sl_mem_init();
 
+       config_init();  /* sets frontendDB */
+
        serverName = lutil_progname( "slapd", argc, argv );
 
        if ( strcmp( serverName, "slapd" ) ) {
@@ -354,13 +354,12 @@ int main( int argc, char **argv )
                        break;
 
                case 'c':       /* provide sync cookie, override if exist in replica */
-                       scp = (struct sync_cookie *) ch_calloc( 1,
-                                                                               sizeof( struct sync_cookie ));
+                       scp = (struct sync_cookie *) ch_calloc( 1, sizeof( struct sync_cookie ));
                        ber_str2bv( optarg, strlen( optarg ), 1, &cookie );
                        ber_bvarray_add( &scp->octet_str, &cookie );
                        slap_parse_sync_cookie( scp );
 
-                       LDAP_STAILQ_FOREACH( scp_entry, &slap_sync_cookie, sc_next ) {
+                       LDAP_STAILQ_FOREACH( scp_entry, &SLAPD_GLOBAL(sync_cookie), sc_next ) {
                                if ( scp->rid == scp_entry->rid ) {
                                        Debug( LDAP_DEBUG_ANY,
                                                    "main: duplicated replica id in cookies\n",
@@ -369,7 +368,7 @@ int main( int argc, char **argv )
                                        goto destroy;
                                }
                        }
-                       LDAP_STAILQ_INSERT_TAIL( &slap_sync_cookie, scp, sc_next );
+                       LDAP_STAILQ_INSERT_TAIL( &SLAPD_GLOBAL(sync_cookie), scp, sc_next );
                        break;
 
                case 'd':       /* set debug level and 'do not detach' flag */
@@ -687,7 +686,7 @@ unhandled_option:;
                        goto destroy;
                }
                /* Retrieve slapd's own ctx */
-               ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx );
+               ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &SLAPD_GLOBAL(tls_ctx) );
                /* Restore previous ctx */
                ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, def_ctx );
        }
@@ -724,7 +723,7 @@ unhandled_option:;
         * FIXME: moved here from slapd_daemon_task()
         * because back-monitor db_open() needs it
         */
-       time( &starttime );
+       time( &SLAPD_GLOBAL(starttime) );
 
        if ( slap_startup( NULL )  != 0 ) {
                rc = 1;
@@ -735,21 +734,21 @@ unhandled_option:;
        Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 
 
-       if ( slapd_pid_file != NULL ) {
-               FILE *fp = fopen( slapd_pid_file, "w" );
+       if ( SLAPD_GLOBAL(pid_file) != NULL ) {
+               FILE *fp = fopen( SLAPD_GLOBAL(pid_file), "w" );
 
                if( fp != NULL ) {
                        fprintf( fp, "%d\n", (int) getpid() );
                        fclose( fp );
 
                } else {
-                       free(slapd_pid_file);
-                       slapd_pid_file = NULL;
+                       free(SLAPD_GLOBAL(pid_file));
+                       SLAPD_GLOBAL(pid_file) = NULL;
                }
        }
 
-       if ( slapd_args_file != NULL ) {
-               FILE *fp = fopen( slapd_args_file, "w" );
+       if ( SLAPD_GLOBAL(args_file) != NULL ) {
+               FILE *fp = fopen( SLAPD_GLOBAL(args_file), "w" );
 
                if( fp != NULL ) {
                        for ( i = 0; i < g_argc; i++ ) {
@@ -758,8 +757,8 @@ unhandled_option:;
                        fprintf( fp, "\n" );
                        fclose( fp );
                } else {
-                       free(slapd_args_file);
-                       slapd_args_file = NULL;
+                       free(SLAPD_GLOBAL(args_file));
+                       SLAPD_GLOBAL(args_file) = NULL;
                }
        }
 
@@ -784,9 +783,9 @@ destroy:
        /* 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 );
+       while ( !LDAP_STAILQ_EMPTY( &SLAPD_GLOBAL(sync_cookie) )) {
+               scp = LDAP_STAILQ_FIRST( &SLAPD_GLOBAL(sync_cookie) );
+               LDAP_STAILQ_REMOVE_HEAD( &SLAPD_GLOBAL(sync_cookie), sc_next );
                ch_free( scp );
        }
 
@@ -826,11 +825,11 @@ stop:
        ldap_pvt_tls_destroy();
 #endif
 
-       if ( slapd_pid_file != NULL ) {
-               unlink( slapd_pid_file );
+       if ( SLAPD_GLOBAL(pid_file) != NULL ) {
+               unlink( SLAPD_GLOBAL(pid_file) );
        }
-       if ( slapd_args_file != NULL ) {
-               unlink( slapd_args_file );
+       if ( SLAPD_GLOBAL(args_file) != NULL ) {
+               unlink( SLAPD_GLOBAL(args_file) );
        }
 
        config_destroy();