|
Lines 1-5
Link Here
|
| 1 |
--- mod_auth_mysql.c.orig 2005-06-22 16:17:45 UTC |
1 |
--- mod_auth_mysql.c.orig 2005-06-22 18:17:45.000000000 +0200 |
| 2 |
+++ mod_auth_mysql.c |
2 |
+++ mod_auth_mysql.c 2019-08-18 11:02:04.472782000 +0200 |
| 3 |
@@ -98,6 +98,10 @@ |
3 |
@@ -98,6 +98,10 @@ |
| 4 |
#define _PORT STRING(PORT) |
4 |
#define _PORT STRING(PORT) |
| 5 |
#endif |
5 |
#endif |
|
Lines 40-46
Link Here
|
| 40 |
#define POOL pool |
40 |
#define POOL pool |
| 41 |
#include <stdlib.h> |
41 |
#include <stdlib.h> |
| 42 |
#include "ap_sha1.h" |
42 |
#include "ap_sha1.h" |
| 43 |
@@ -589,87 +597,87 @@ static void * create_mysql_auth_dir_conf |
43 |
@@ -589,87 +597,87 @@ |
| 44 |
static |
44 |
static |
| 45 |
command_rec mysql_auth_cmds[] = { |
45 |
command_rec mysql_auth_cmds[] = { |
| 46 |
AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot, |
46 |
AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot, |
|
Lines 149-157
Link Here
|
| 149 |
OR_AUTHCFG, "mysql character set to be used"), |
149 |
OR_AUTHCFG, "mysql character set to be used"), |
| 150 |
|
150 |
|
| 151 |
{ NULL } |
151 |
{ NULL } |
| 152 |
@@ -905,7 +913,16 @@ static char * format_remote_host(request |
152 |
@@ -811,7 +819,8 @@ |
|
|
153 |
make_scrambled_password_323(encrypted_sent_pw, sent_pw); |
| 154 |
else |
| 155 |
#endif |
| 156 |
- make_scrambled_password(encrypted_sent_pw, sent_pw); |
| 157 |
+/* mariadb has a different call */ |
| 158 |
+ ma_make_scrambled_password(encrypted_sent_pw, sent_pw); |
| 159 |
return strcmp(real_pw, encrypted_sent_pw) == 0; |
| 153 |
} |
160 |
} |
| 154 |
|
161 |
|
|
|
162 |
@@ -905,7 +914,16 @@ |
| 163 |
} |
| 164 |
|
| 155 |
static char * format_remote_ip(request_rec * r, char ** parm) { |
165 |
static char * format_remote_ip(request_rec * r, char ** parm) { |
| 156 |
- return r->connection->remote_ip; |
166 |
- return r->connection->remote_ip; |
| 157 |
+/* |
167 |
+/* |
|
Lines 167-173
Link Here
|
| 167 |
} |
177 |
} |
| 168 |
|
178 |
|
| 169 |
static char * format_filename(request_rec * r, char ** parm) { |
179 |
static char * format_filename(request_rec * r, char ** parm) { |
| 170 |
@@ -1270,7 +1287,7 @@ static int mysql_check_auth(request_rec |
180 |
@@ -1270,7 +1288,7 @@ |
| 171 |
int method = r->method_number; |
181 |
int method = r->method_number; |
| 172 |
|
182 |
|
| 173 |
#ifdef APACHE2 |
183 |
#ifdef APACHE2 |