Commit b74ba295 authored by Bodo Möller's avatar Bodo Möller
Browse files

Reinitialize global variables when necessary (for monolith application).

parent ba3a6e72

apps/ca.c

+4 −0
Original line number Diff line number Diff line
@@ -273,9 +273,13 @@ EF_ALIGNMENT=0; 


	apps_startup();



	key = NULL;

	section = NULL;



	X509V3_add_standard_extensions();



	preserve=0;

	msie_hack=0;

	if (bio_err == NULL)

		if ((bio_err=BIO_new(BIO_s_file())) != NULL)

			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);

apps/crl.c

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ bad: 
end:

	BIO_free(out);

	BIO_free(bio_out);

	bio_out=NULL;

	X509_CRL_free(x);

	X509V3_EXT_cleanup();

	EXIT(ret);

apps/req.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ int MAIN(int argc, char **argv) 
	MS_STATIC char config_name[256];

#endif



	req_conf = NULL;

#ifndef NO_DES

	cipher=EVP_des_ede3_cbc();

#endif

apps/s_server.c

+11 −5
Original line number Diff line number Diff line
@@ -107,7 +107,9 @@ static void print_stats(BIO *bp,SSL_CTX *ctx); 
static DH *load_dh_param(void );

static DH *get_dh512(void);

#endif

/* static void s_server_init(void);*/

#ifdef MONOLITH

static void s_server_init(void);

#endif



#ifndef S_ISDIR

# if defined(_S_IFMT) && defined(_S_IFDIR)
@@ -175,9 +177,12 @@ static BIO *bio_s_out=NULL; 
static int s_debug=0;

static int s_quiet=0;



#if 0

static int hack=0;



#ifdef MONOLITH

static void s_server_init(void)

	{

	accept_socket=-1;

	cipher=NULL;

	s_server_verify=SSL_VERIFY_NONE;

	s_dcert_file=NULL;
@@ -194,6 +199,7 @@ static void s_server_init(void) 
	bio_s_out=NULL;

	s_debug=0;

	s_quiet=0;

	hack=0;

	}

#endif
@@ -240,7 +246,6 @@ static void sv_usage(void) 


static int local_argc=0;

static char **local_argv;

static int hack=0;



#ifdef CHARSET_EBCDIC

static int ebcdic_new(BIO *bi);
@@ -419,8 +424,9 @@ int MAIN(int argc, char *argv[]) 
	local_argv=argv;



	apps_startup();

	s_quiet=0;

	s_debug=0;

#ifdef MONOLITH

	s_server_init();

#endif



	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);