diff -ur openssl-1.0.0c/apps/s_client.c openssl-new/apps/s_client.c
--- openssl-1.0.0c/apps/s_client.c	2009-12-16 21:28:28.000000000 +0100
+++ openssl-new/apps/s_client.c	2010-12-03 10:29:15.000000000 +0100
@@ -899,7 +899,7 @@
 	if (!set_cert_key_stuff(ctx,cert,key))
 		goto end;
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
+	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
 		(!SSL_CTX_set_default_verify_paths(ctx)))
 		{
 		/* BIO_printf(bio_err,"error setting default verify locations\n"); */