diff options
| author | Martin Willi <martin@revosec.ch> | 2012-03-05 17:57:16 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-05 18:08:04 +0100 |
| commit | 2e3615e4ad90c97e62af7ab2a7240518a457256a (patch) | |
| tree | 9e4d8bb5ab4b0abd2e9d57e7ef864c6f8c985201 /src | |
| parent | 4cd176d525fbf20159e22d7cd4baeeb0c2e7ad1b (diff) | |
| download | strongswan-2e3615e4ad90c97e62af7ab2a7240518a457256a.tar.bz2 strongswan-2e3615e4ad90c97e62af7ab2a7240518a457256a.tar.xz | |
Prefer EAP-Identity to read radattr RADIUS attribute file
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/radattr/radattr_listener.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libcharon/plugins/radattr/radattr_listener.c b/src/libcharon/plugins/radattr/radattr_listener.c index 7f47a8847..2f1b18fe3 100644 --- a/src/libcharon/plugins/radattr/radattr_listener.c +++ b/src/libcharon/plugins/radattr/radattr_listener.c @@ -102,16 +102,25 @@ static void print_radius_attributes(private_radattr_listener_t *this, * Add a RADIUS attribute from a client-ID specific file to an IKE message */ static void add_radius_attribute(private_radattr_listener_t *this, - identification_t *id, message_t *message) + ike_sa_t *ike_sa, message_t *message) { if (this->dir && message->get_message_id(message) == this->mid) { + identification_t *id; + auth_cfg_t *auth; char path[PATH_MAX]; chunk_t data; struct stat sb; void *addr; int fd; + auth = ike_sa->get_auth_cfg(ike_sa, TRUE); + id = auth->get(auth, AUTH_RULE_EAP_IDENTITY); + if (!id) + { + id = ike_sa->get_my_id(ike_sa); + } + snprintf(path, sizeof(path), "%s/%Y", this->dir, id); fd = open(path, O_RDONLY); if (fd != -1) @@ -173,7 +182,7 @@ METHOD(listener_t, message, bool, } else { - add_radius_attribute(this, ike_sa->get_my_id(ike_sa), message); + add_radius_attribute(this, ike_sa, message); } } return TRUE; |