diff options
| author | monty@nosik.monty.fi <> | 2006-11-22 14:11:36 +0200 |
|---|---|---|
| committer | monty@nosik.monty.fi <> | 2006-11-22 14:11:36 +0200 |
| commit | 89570bf966570ecce761e1fea2bb5d10db91f621 (patch) | |
| tree | bd11d4efaf1d6469e7f29237347f12cdf71e605a /vio/viosslfactories.c | |
| parent | 38a92caeb77c6b22eeac985530cfbfdc890c792d (diff) | |
| parent | 306b871d522b1fa744abf78acaafab2379a98401 (diff) | |
| download | mariadb-git-89570bf966570ecce761e1fea2bb5d10db91f621.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 77eedab87e4..7bb2258532f 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -79,8 +79,8 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) { DBUG_ENTER("vio_set_cert_stuff"); - DBUG_PRINT("enter", ("ctx: %p, cert_file: %s, key_file: %s", - ctx, cert_file, key_file)); + DBUG_PRINT("enter", ("ctx: 0x%lx cert_file: %s key_file: %s", + (long) ctx, cert_file, key_file)); if (cert_file) { if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) @@ -128,7 +128,7 @@ vio_verify_callback(int ok, X509_STORE_CTX *ctx) X509 *err_cert; DBUG_ENTER("vio_verify_callback"); - DBUG_PRINT("enter", ("ok: %d, ctx: %p", ok, ctx)); + DBUG_PRINT("enter", ("ok: %d ctx: 0x%lx", ok, (long) ctx)); err_cert= X509_STORE_CTX_get_current_cert(ctx); X509_NAME_oneline(X509_get_subject_name(err_cert), buf, sizeof(buf)); @@ -139,7 +139,7 @@ vio_verify_callback(int ok, X509_STORE_CTX *ctx) err= X509_STORE_CTX_get_error(ctx); depth= X509_STORE_CTX_get_error_depth(ctx); - DBUG_PRINT("error",("verify error: %d, '%s'",err, + DBUG_PRINT("error",("verify error: %d '%s'",err, X509_verify_cert_error_string(err))); /* Approve cert if depth is greater then "verify_depth", currently |