diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
| commit | ae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch) | |
| tree | 6f5017d7d25380d567084842e35015f52724e8d1 /vio | |
| parent | 1b50d599606244677215fbe7b05be1a891fecf18 (diff) | |
| parent | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff) | |
| download | mariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 11d01ea534d..2040c3432b8 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2011, 2015, MariaDB +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -236,7 +236,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file, } /* Load certs from the trusted ca */ - if (SSL_CTX_load_verify_locations(ssl_fd->ssl_context, ca_file, ca_path) == 0) + if (SSL_CTX_load_verify_locations(ssl_fd->ssl_context, ca_file, ca_path) <= 0) { DBUG_PRINT("warning", ("SSL_CTX_load_verify_locations failed")); if (ca_file || ca_path) |