Commit 0e441bc2 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change dir_ctrl to check for the environment variable before using the default 

directory instead of the other way around.

PR: 1131
parent d996a9af

crypto/x509/by_dir.c

+6 −6
Original line number Diff line number Diff line
@@ -122,19 +122,19 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, 
		{

	case X509_L_ADD_DIR:

		if (argl == X509_FILETYPE_DEFAULT)

			dir=(char *)Getenv(X509_get_default_cert_dir_env());

			if (dir)

			ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);

			else

			{

			ret=add_cert_dir(ld,X509_get_default_cert_dir(),

				X509_FILETYPE_PEM);

			}

			if (!ret)

				{

				X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR);

				}

			else

				{

				dir=(char *)Getenv(X509_get_default_cert_dir_env());

				ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);

				}

			}



		else

			ret=add_cert_dir(ld,argp,(int)argl);

		break;