diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-23 15:14:01 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-23 15:14:01 +0300 |
| commit | 41abdd90cc3bae76131022f99090d259bf111426 (patch) | |
| tree | bca567751e08d245abe17e089c4c522b91c2dbe8 /sql/sql_acl.cc | |
| parent | 915aaa1805b4828196e3e96601f58b460122e7c2 (diff) | |
| download | mariadb-git-41abdd90cc3bae76131022f99090d259bf111426.tar.gz | |
Changed relay_log_space to ulonglong
Removed compiler warnings.
Build-tools/Do-compile:
Simple cleanup
include/mysql.h:
Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
Documented test
Change to be runnable from mysql
sql/mini_client.cc:
Removed dead code
sql/mysqld.cc:
Changed relay_log_space to ulonglong
sql/slave.cc:
Changed relay_log_space to ulonglong
Removed dead code
sql/slave.h:
Changed relay_log_space to ulonglong
sql/sql_acl.cc:
Removed not used variables
sql/sql_base.cc:
Removed not used variables
sql/sql_cache.cc:
Removed not used variables
sql/sql_select.cc:
Removed not used variables
vio/vio.c:
Re-order include files to remove compiler warnings
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index aad37477a70..5e32da07aad 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -501,7 +501,6 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, { ulong user_access=NO_ACCESS; *priv_user=(char*) user; - char *ptr=0; DBUG_ENTER("acl_getroot"); bzero(mqh,sizeof(USER_RESOURCES)); @@ -578,34 +577,29 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user, if (acl_user->x509_issuer) { DBUG_PRINT("info",("checkpoint 3")); - ptr = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0); + 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)) - user_access=acl_user->access; - else + if (strcmp(acl_user->x509_issuer, ptr)) { user_access=NO_ACCESS; free(ptr); break; } + user_access=acl_user->access; free(ptr); } DBUG_PRINT("info",("checkpoint 4")); /* X509 subject is specified, we check it .. */ if (acl_user->x509_subject) { - ptr = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0); + char *ptr= X509_NAME_oneline(X509_get_subject_name(cert), 0, 0); DBUG_PRINT("info",("comparing subjects: '%s' and '%s'", acl_user->x509_subject, ptr)); - if (!strcmp(acl_user->x509_subject,ptr)) - user_access=acl_user->access; - else - { + if (strcmp(acl_user->x509_subject,ptr)) user_access=NO_ACCESS; - free(ptr); - break; - } + else + user_access=acl_user->access; free(ptr); } break; |