1 commit 63b772af295acf572b25118c0bd62735a3eb09b9
2 Author: Frank DENIS <github@pureftpd.org>
3 Date: Sat Apr 2 17:40:53 2011 +0200
5 Use my_make_scrambled_password() instead of make_scrambled_password()
7 make_scrambled_password() is not exported anymore in Fedora, but as
8 Arkadiusz Miskiewicz pointed out, my_make_scrambled_password() recently is.
10 diff --git a/configure.ac b/configure.ac
11 index 4b7afe7..937c15f 100644
14 @@ -1216,10 +1216,10 @@ AC_ARG_WITH(mysql,
18 - AC_MSG_ERROR(Your MySQL client libraries aren't properly installed)
19 + AC_MSG_ERROR(Your MySQL client libraries aren't properly installed)
22 - AC_CHECK_FUNCS(mysql_real_escape_string)
23 + AC_CHECK_FUNCS(mysql_real_escape_string my_make_scrambled_password)
27 diff --git a/src/log_mysql.c b/src/log_mysql.c
28 index c6202fe..2d9eafd 100644
31 @@ -451,7 +451,12 @@ void pw_mysql_check(AuthResult * const result,
32 # if MYSQL_VERSION_ID >= 40100 && MYSQL_VERSION_ID < 40101
33 make_scrambled_password(scrambled_password, password, 1, NULL);
35 +# ifdef HAVE_MY_MAKE_SCRAMBLED_PASSWORD
36 + my_make_scrambled_password(scrambled_password, password,
39 make_scrambled_password(scrambled_password, password);
43 if (strcmp(scrambled_password, spwd) == 0) {