summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authorunknown <kostja@oak.local>2003-07-04 20:52:04 +0400
committerunknown <kostja@oak.local>2003-07-04 20:52:04 +0400
commitccbcf1c9da89eaee2dfb4219da1d86b6f590ac20 (patch)
tree8b19a2b1b84bfe2fb3f99f403acec7fb0a600501 /include/mysql_com.h
parentdbb088b034e19e99ec209cbbc4eed3bff64172da (diff)
downloadmariadb-git-ccbcf1c9da89eaee2dfb4219da1d86b6f590ac20.tar.gz
Bug fixes for authentication
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions. BitKeeper/etc/ignore: Added BitKeeper/post-commit BitKeeper/post-commit-manual build_tags.sh tests/connect_test BUILD/compile-pentium-maintainer to the ignore list include/mysql_com.h: scramble return type changed to void as now it's not used libmysql/libmysql.c: fixed bug with with failed authentification when scramble contained zero byte sql-common/client.c: applied patch from Lycos team fixed bug with scramble containing zero byte sql/item_create.cc: removed create_func_old_password, create_func_password as they are not used any more sql/item_create.h: removed create_func_old_password, create_func_password as they are not used any more sql/item_strfunc.cc: Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy sql/item_strfunc.h: Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy sql/lex.h: OLD_PASSWORD now is keyword, to allow statements like set password=old_password('abc') sql/password.c: fixed scramble return value trailing zero now is not written sql/sql_acl.cc: incorporated patch from Lycos team 41 replaced with constant acl_getroot rewritten to support ER_AUTH_... error sql/sql_parse.cc: authenticate merged with check_user check_user return values reversed, support for ER_AUTH in check_user.added sql/sql_yacc.yy: OLD_PASSWORD now is keyword, to allow statements like set password=old_password('abc')
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index c1f18160667..784a7782855 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -327,7 +327,7 @@ void get_salt_from_password_323(unsigned long *res, const char *password);
void make_password_from_salt_323(char *to, const unsigned long *salt);
void make_scrambled_password(char *to, const char *password);
-char *scramble(char *to, const char *message, const char *password);
+void scramble(char *to, const char *message, const char *password);
my_bool check_scramble(const char *reply, const char *message,
const unsigned char *hash_stage2);
void get_salt_from_password(unsigned char *res, const char *password);