|
Lines 1-4
Link Here
|
| 1 |
--- mod_auth_mysql.c.orig 2005-06-22 16:17:45 UTC |
1 |
--- mod_auth_mysql.c.orig 2017-12-12 14:51:29 UTC |
| 2 |
+++ mod_auth_mysql.c |
2 |
+++ mod_auth_mysql.c |
| 3 |
@@ -98,6 +98,10 @@ |
3 |
@@ -98,6 +98,10 @@ |
| 4 |
#define _PORT STRING(PORT) |
4 |
#define _PORT STRING(PORT) |
|
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 |
@@ -806,12 +814,14 @@ static char hex2chr(char * in) { |
|
|
153 |
/* Checks scrambled passwords */ |
| 154 |
static short pw_scrambled(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) { |
| 155 |
char * encrypted_sent_pw = PCALLOC(pool, SCRAMBLED_PASSWORD_CHAR_LENGTH+1); |
| 156 |
+ void my_make_scrambled_password(char *to, const char *password, size_t pass_len); |
| 157 |
+ |
| 158 |
#ifdef SCRAMBLED_PASSWORD_CHAR_LENGTH_323 /* If we may need to use old password */ |
| 159 |
if (real_pw[0] != '*') |
| 160 |
make_scrambled_password_323(encrypted_sent_pw, sent_pw); |
| 161 |
else |
| 162 |
#endif |
| 163 |
- make_scrambled_password(encrypted_sent_pw, sent_pw); |
| 164 |
+ my_make_scrambled_password(encrypted_sent_pw, sent_pw, strlen(sent_pw)); |
| 165 |
return strcmp(real_pw, encrypted_sent_pw) == 0; |
| 153 |
} |
166 |
} |
| 154 |
|
167 |
|
|
|
168 |
@@ -905,7 +915,16 @@ static char * format_remote_host(request |
| 169 |
} |
| 170 |
|
| 155 |
static char * format_remote_ip(request_rec * r, char ** parm) { |
171 |
static char * format_remote_ip(request_rec * r, char ** parm) { |
| 156 |
- return r->connection->remote_ip; |
172 |
- return r->connection->remote_ip; |
| 157 |
+/* |
173 |
+/* |
|
Lines 167-173
Link Here
|
| 167 |
} |
183 |
} |
| 168 |
|
184 |
|
| 169 |
static char * format_filename(request_rec * r, char ** parm) { |
185 |
static char * format_filename(request_rec * r, char ** parm) { |
| 170 |
@@ -1270,7 +1287,7 @@ static int mysql_check_auth(request_rec |
186 |
@@ -1270,7 +1289,7 @@ static int mysql_check_auth(request_rec |
| 171 |
int method = r->method_number; |
187 |
int method = r->method_number; |
| 172 |
|
188 |
|
| 173 |
#ifdef APACHE2 |
189 |
#ifdef APACHE2 |