diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:51:04 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:51:04 +0200 |
| commit | a8c13c34a1b39b1f1fe06458b95f46b900576a51 (patch) | |
| tree | 04caa7968d238098bba4bc4a7921ace702698b77 /sql/sql_acl.cc | |
| parent | 74e7b09c704ff6c839c7351f6d91a0aa5f172ac2 (diff) | |
| parent | e1827da7fbfebe19dd7e3265222e9369fe8fb532 (diff) | |
| download | mariadb-git-a8c13c34a1b39b1f1fe06458b95f46b900576a51.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
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 3c8c32fe57c..bc377a0ec16 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -987,8 +987,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)) { |