| 1 |
chainsaw 14/09/24 13:13:30 |
| 2 |
|
| 3 |
Added: 0.4.6-fallback-support.diff |
| 4 |
Log: |
| 5 |
Support server fallback if the primary does not respond, patch by Austin Kauffman with some improvements from InterWorking Labs. Explicitly depend on the Apache server, closes bug #514260 by Patrick "bonsaikitten" Lauer. |
| 6 |
|
| 7 |
(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0.4.6-fallback-support.diff |
| 16 |
=================================================================== |
| 17 |
diff -uNr mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c mod_auth_xradius-0.4.6/src/mod_auth_xradius.c |
| 18 |
--- mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c 2014-09-24 13:41:22.990073508 +0100 |
| 19 |
+++ mod_auth_xradius-0.4.6/src/mod_auth_xradius.c 2014-09-24 13:50:17.204100114 +0100 |
| 20 |
@@ -125,15 +125,15 @@ |
| 21 |
rctx = xrad_auth_open(); |
| 22 |
|
| 23 |
/* Loop through the array of RADIUS Servers, adding them to the rctx object */ |
| 24 |
- sr = (xrad_server_info *) dc->servers->elts; |
| 25 |
for (i = 0; i < dc->servers->nelts; ++i) { |
| 26 |
- rc = xrad_add_server(rctx, sr[i].hostname, sr[i].port, sr[i].secret, |
| 27 |
+ sr = &(((xrad_server_info*)dc->servers->elts)[i]); |
| 28 |
+ rc = xrad_add_server(rctx, sr->hostname, sr->port, sr->secret, |
| 29 |
dc->timeout, dc->maxtries); |
| 30 |
|
| 31 |
if (rc != 0) { |
| 32 |
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, |
| 33 |
"xradius: Failed to add server '%s:%d': (%d) %s", |
| 34 |
- sr[i].hostname, sr[i].port, rc, xrad_strerror(rctx)); |
| 35 |
+ sr->hostname, sr->port, rc, xrad_strerror(rctx)); |
| 36 |
goto run_cleanup; |
| 37 |
} |
| 38 |
} |
| 39 |
@@ -294,7 +294,7 @@ |
| 40 |
/* To properly use the Pools, this array is allocated from the here, instead of |
| 41 |
inside the directory configuration creation function. */ |
| 42 |
if (dc->servers == NULL) { |
| 43 |
- dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info*)); |
| 44 |
+ dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info)); |
| 45 |
} |
| 46 |
|
| 47 |
sr = apr_array_push(dc->servers); |
Archives