diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-09 10:44:19 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-09 10:44:19 +0200 |
| commit | c7e2527c9a5268ca301fea2c032c5066771ab4ca (patch) | |
| tree | 05996a868c7d44df29b7b6d651a78aeee72c4b6a /sql/sql_acl.cc | |
| parent | 42f20d7538f282ccf283eeadd0454c5bea9e8d7d (diff) | |
| parent | 0d3825a67e3476455871a6f396323d158a19485f (diff) | |
| download | mariadb-git-c7e2527c9a5268ca301fea2c032c5066771ab4ca.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ec1caba0b5d..5b40f93f002 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -858,8 +858,8 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, if (acl_user->x509_issuer) { DBUG_PRINT("info",("checkpoint 3")); - char *ptr = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0); - DBUG_PRINT("info",("comparing issuers: '%s' and '%s'", + char *ptr = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0); + DBUG_PRINT("info",("comparing issuers: '%s' and '%s'", acl_user->x509_issuer, ptr)); if (strcmp(acl_user->x509_issuer, ptr)) { |