From: Arran Cudbard-Bell Date: Thu, 22 Jun 2017 21:18:38 +0000 (-0400) Subject: Use request->server_cs instead of request->server for hashing X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a4e27f8bc3c7094330e1b711af604e8f1a106bd;p=thirdparty%2Ffreeradius-server.git Use request->server_cs instead of request->server for hashing request->server isn't being set somewhere, and is annoying and should die. --- diff --git a/src/main/state.c b/src/main/state.c index 218db7d8888..e02e2462ade 100644 --- a/src/main/state.c +++ b/src/main/state.c @@ -464,7 +464,7 @@ static fr_state_entry_t *state_entry_create(fr_state_tree_t *state, REQUEST *req * only succeed in the virtual server that created the state * value. */ - *((uint32_t *)(&entry->state_comp.server_hash)) ^= fr_hash_string(request->server); + *((uint32_t *)(&entry->state_comp.server_hash)) ^= fr_hash_string(cf_section_name2(request->server_cs)); if (!rbtree_insert(state->tree, entry)) { talloc_free(entry); @@ -509,7 +509,7 @@ static fr_state_entry_t *state_entry_find(fr_state_tree_t *state, REQUEST *reque /* * Make it unique for different virtual servers handling the same request */ - my_entry.state_comp.server_hash ^= fr_hash_string(request->server); + my_entry.state_comp.server_hash ^= fr_hash_string(cf_section_name2(request->server_cs)); entry = rbtree_finddata(state->tree, &my_entry);