projects
/
freeradius.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c4250d1
)
Move debug messages into rad_virtual_server
author
Alan T. DeKok
<aland@freeradius.org>
Tue, 24 Jun 2014 18:06:36 +0000
(14:06 -0400)
committer
Alan T. DeKok
<aland@freeradius.org>
Tue, 24 Jun 2014 18:43:39 +0000
(14:43 -0400)
To remove duplication
src/main/auth.c
patch
|
blob
|
history
src/modules/rlm_eap/types/rlm_eap_peap/peap.c
patch
|
blob
|
history
src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
patch
|
blob
|
history
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
patch
|
blob
|
history
diff --git
a/src/main/auth.c
b/src/main/auth.c
index
9073c64
..
e07d54b
100644
(file)
--- a/
src/main/auth.c
+++ b/
src/main/auth.c
@@
-650,6
+650,10
@@
int rad_virtual_server(REQUEST *request)
VALUE_PAIR *vp;
int result;
VALUE_PAIR *vp;
int result;
+ RDEBUG("server %s {", request->server);
+ RDEBUG(" Request:");
+ debug_pair_list(request->packet->vps);
+
/*
* We currently only handle AUTH packets here.
* This could be expanded to handle other packets as well if required.
/*
* We currently only handle AUTH packets here.
* This could be expanded to handle other packets as well if required.
@@
-668,6
+672,9
@@
int rad_virtual_server(REQUEST *request)
rad_postauth(request);
}
rad_postauth(request);
}
+ RDEBUG(" Reply:");
+ debug_pair_list(request->reply->vps);
+ RDEBUG("} # server %s", request->server);
+
return result;
}
return result;
}
-
diff --git
a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index
d5f5db3
..
63093ab
100644
(file)
--- a/
src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/
src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@
-815,12
+815,7
@@
rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
fake->server = t->soh_virtual_server;
}
RDEBUG("Sending SoH request to server %s", fake->server ? fake->server : "NULL");
fake->server = t->soh_virtual_server;
}
RDEBUG("Sending SoH request to server %s", fake->server ? fake->server : "NULL");
- debug_pair_list(fake->packet->vps);
- RDEBUG("server %s {", fake->server);
rad_virtual_server(fake);
rad_virtual_server(fake);
- RDEBUG("} # server %s", fake->server);
- RDEBUG("Got SoH reply");
- debug_pair_list(fake->reply->vps);
if (fake->reply->code != PW_CODE_ACCESS_ACCEPT) {
RDEBUG2("SoH was rejected");
if (fake->reply->code != PW_CODE_ACCESS_ACCEPT) {
RDEBUG2("SoH was rejected");
diff --git
a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index
0f49eec
..
051b36f
100644
(file)
--- a/
src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/
src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@
-168,14
+168,8
@@
static int CC_HINT(nonnull) mod_authenticate(void *type_arg, eap_handler_t *hand
}
RDEBUG("Processing EAP-TLS Certificate check:");
}
RDEBUG("Processing EAP-TLS Certificate check:");
- debug_pair_list(fake->packet->vps);
-
- RDEBUG("server %s {", fake->server);
-
rad_virtual_server(fake);
rad_virtual_server(fake);
- RDEBUG("} # server %s", fake->server);
-
/* copy the reply vps back to our reply */
pairfilter(request->reply, &request->reply->vps,
&fake->reply->vps, 0, 0, TAG_ANY);
/* copy the reply vps back to our reply */
pairfilter(request->reply, &request->reply->vps,
&fake->reply->vps, 0, 0, TAG_ANY);
diff --git
a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index
48e0c72
..
82da48b
100644
(file)
--- a/
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@
-1152,11
+1152,6
@@
int eapttls_process(eap_handler_t *handler, tls_session_t *tls_session)
if ((debug_flag > 0) && fr_log_fp) {
RDEBUG("Sending tunneled request");
if ((debug_flag > 0) && fr_log_fp) {
RDEBUG("Sending tunneled request");
-
- debug_pair_list(fake->packet->vps);
-
- fprintf(fr_log_fp, "server %s {\n",
- (!fake->server) ? "" : fake->server);
}
/*
}
/*
@@
-1166,19
+1161,6
@@
int eapttls_process(eap_handler_t *handler, tls_session_t *tls_session)
rad_virtual_server(fake);
/*
rad_virtual_server(fake);
/*
- * Note that we don't do *anything* with the reply
- * attributes.
- */
- if ((debug_flag > 0) && fr_log_fp) {
- fprintf(fr_log_fp, "} # server %s\n",
- (!fake->server) ? "" : fake->server);
-
- RDEBUG("Got tunneled reply code %d", fake->reply->code);
-
- debug_pair_list(fake->reply->vps);
- }
-
- /*
* Decide what to do with the reply.
*/
switch (fake->reply->code) {
* Decide what to do with the reply.
*/
switch (fake->reply->code) {