diff options
Diffstat (limited to 'www/mod_auth_mysql/files/patch-ad')
| -rw-r--r-- | www/mod_auth_mysql/files/patch-ad | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/www/mod_auth_mysql/files/patch-ad b/www/mod_auth_mysql/files/patch-ad index 0d22b3a8ef91..2e305c698b45 100644 --- a/www/mod_auth_mysql/files/patch-ad +++ b/www/mod_auth_mysql/files/patch-ad @@ -1,10 +1,11 @@ --- mod_auth_mysql.c.orig Sat Oct 3 13:41:41 1998 -+++ mod_auth_mysql.c Sun Sep 28 14:21:47 2003 -@@ -372,7 +372,11 @@ ++++ mod_auth_mysql.c Tue Feb 24 05:53:32 2004 +@@ -372,7 +372,12 @@ } if (name != NULL) { /* open an SQL link */ /* link to the MySQL database and register its cleanup!@$ */ +#if MYSQL_VERSION_ID >= 40000 ++ mysql_init(&auth_sql_server); + mysql_auth = mysql_real_connect(&auth_sql_server, auth_db_host, user, pwd, name, 0, NULL, 0); +#else /* MYSQL_VERSION_ID < 40000 */ mysql_auth = mysql_connect(&auth_sql_server, auth_db_host, user, pwd); @@ -12,7 +13,7 @@ if (sec->non_persistent && mysql_auth) { note_cleanups_for_mysql_auth(r->pool, mysql_auth); } -@@ -559,6 +563,10 @@ +@@ -559,6 +564,10 @@ switch (mysql_check_user_password(r, c->user, sent_pw, sec)) { case 0: @@ -23,7 +24,7 @@ note_basic_auth_failure(r); return AUTH_REQUIRED; break; -@@ -582,6 +590,7 @@ +@@ -582,6 +591,7 @@ { mysql_auth_config_rec *sec = (mysql_auth_config_rec *) get_module_config(r->per_dir_config, &auth_mysql_module); char *user = r->connection->user; @@ -31,7 +32,7 @@ int m = r->method_number; int method_restricted = 0; register int x; -@@ -653,6 +662,10 @@ +@@ -653,6 +663,10 @@ if (!(sec->assume_authoritative)) { return DECLINED; } |