summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2006-10-16 14:48:30 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2006-10-16 14:48:30 +0000
commit6305d8ed51a111368de196c789ca28f61ab63546 (patch)
treea151ac1a42500086226b6e7ea942dc9c634f06b7
parent21459954c24a8e1669ee78370cade4e5dc224739 (diff)
downloadmailutils-6305d8ed51a111368de196c789ca28f61ab63546.tar.gz
mailutils-6305d8ed51a111368de196c789ca28f61ab63546.tar.bz2
(octet2hex): Rename to mu_octet_to_hex to avoid name clashes with mysql
-rw-r--r--sql/mysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql.c b/sql/mysql.c
index 9961ce341..2fab5be23 100644
--- a/sql/mysql.c
+++ b/sql/mysql.c
@@ -252,7 +252,7 @@ scramble_password (unsigned long *result, const char *password)
}
static void
-octet2hex (char *to, const unsigned char *str, unsigned len)
+mu_octet_to_hex (char *to, const unsigned char *str, unsigned len)
{
const unsigned char *str_end= str + len;
static char d[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -285,7 +285,7 @@ mu_check_mysql_4x_password (const char *scrambled, const char *message)
/* convert hash_stage2 to hex string */
to[0] = '*';
- octet2hex (to + 1, hash_stage2, SHA1_HASH_SIZE);
+ mu_octet_to_hex (to + 1, hash_stage2, SHA1_HASH_SIZE);
/* Compare both strings */
return memcmp (to, scrambled, strlen (scrambled));

Return to:

Send suggestions and report system problems to the System administrator.