summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--radsecproxy.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f01767e..d3991c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Unreleased 1.6.6-dev
+ Bug fixes:
+ - Have rewriteIn for servers use the correct config section. We
+ used to apply rewriteIn using the rewrite block of the client
+ rather than the server. Patch by Fabian Mauchle. Fixes
+ RADSECPROXY-59.
+
2013-09-06 1.6.5
Bug fixes:
- Fix a crash bug introduced in 1.6.4. Fixes RADSECPROXY-53,
diff --git a/radsecproxy.c b/radsecproxy.c
index b7b2063..126a0a7 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1638,9 +1638,8 @@ void replyh(struct server *server, unsigned char *buf) {
}
gettimeofday(&server->lastreply, NULL);
- from = rqout->rq->from;
- if (server->conf->rewritein && !dorewrite(msg, from->conf->rewritein)) {
+ if (server->conf->rewritein && !dorewrite(msg, server->conf->rewritein)) {
debug(DBG_INFO, "replyh: rewritein failed");
goto errunlock;
}
@@ -1651,6 +1650,8 @@ void replyh(struct server *server, unsigned char *buf) {
goto errunlock;
}
+ from = rqout->rq->from;
+
/* MS MPPE */
for (node = list_first(msg->attrs); node; node = list_next(node)) {
attr = (struct tlv *)node->data;