Actually remove the server_cs field

diff --git a/src/lib/eap/chbind.c b/src/lib/eap/chbind.c
index 6d489cbf302531d7cc7274fc24793e0968a80b98..9e09488b618e2dd8c0480974c0cd570aa5b2f3b1 100644 (file)
--- a/src/lib/eap/chbind.c
+++ b/src/lib/eap/chbind.c
@@ -238,7 +238,7 @@ fr_radius_packet_code_t chbind_process(request_t *request, CHBIND_REQ *chbind)
         *      Set virtual server based on configuration for channel
         *      bindings, this is hard-coded for now.
         */
-       fake->server_cs = virtual_server_find("channel_bindings");
+//     fake->server_cs = virtual_server_find("channel_bindings");
        fake->packet->code = FR_RADIUS_CODE_ACCESS_REQUEST;
 
        rad_virtual_server(&rcode, fake);

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 82dcd5c697e601f28a38c38c1645f10eaca472fe..5ca7bc4752563bb2ff4962623812f0eb16806209 100644 (file)
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -142,8 +142,6 @@ static inline CC_HINT(always_inline) int request_child_init(request_t *child, re
         *
         *      FIXME: Permit different servers for inner && outer sessions?
         */
-       child->server_cs = parent->server_cs;
-
        child->packet = fr_radius_packet_alloc(child, true);
        if (!child->packet) {
                talloc_free(child);

diff --git a/src/lib/server/request.h b/src/lib/server/request.h
index b58cb58ec6502f65b67422da523444131daf6e16..bf30e174c6ef24fc3ca198a2d6304e8615a4e5e4 100644 (file)
--- a/src/lib/server/request.h
+++ b/src/lib/server/request.h
@@ -200,7 +200,6 @@ struct request_s {
                                                //!< working with the request, to do something.
 
        rlm_rcode_t             rcode;          //!< Last rcode returned by a module
-       CONF_SECTION            *server_cs;     //!< virtual server which is processing the request.
 
        fr_rb_node_t            dedup_node;     //!< entry in the deduplication tree.
        int32_t                 runnable_id;    //!< entry in the queue / heap of runnable packets

diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c
index 7ef8c27d14ba6066ed9077f4e007507005664875..bc708ba7e93697ed1b196357f2c951dc46ededda 100644 (file)
--- a/src/lib/server/trigger.c
+++ b/src/lib/server/trigger.c
@@ -377,7 +377,6 @@ int trigger_exec(request_t *request, CONF_SECTION const *cs, char const *name, b
         *      radius_exec_program always needs a request.
         */
        fake = request_alloc(NULL, (&(request_init_args_t){ .parent = request, .detachable = true }));
-       memcpy(&fake->server_cs, &subcs, sizeof(subcs)); /* completely wrong, but we need to use _something_ */
 
        /*
         *      Add the args to the request data, so they can be picked up by the

diff --git a/src/lib/unlang/io.c b/src/lib/unlang/io.c
index 828814a01badf7d2f58645c12407b692ee1b1899..d21126b77a428d4be7a5a56ff5c0676350720144 100644 (file)
--- a/src/lib/unlang/io.c
+++ b/src/lib/unlang/io.c
@@ -66,7 +66,6 @@ request_t *unlang_io_subrequest_alloc(request_t *parent, fr_dict_t const *namesp
         */
        child->number = parent->number;
        child->el = parent->el;
-       child->server_cs = parent->server_cs;
        child->backlog = parent->backlog;
 
        /*

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 59c108ff2c06c8b9a3ca1ce749ce4a9e6a269c46..8b17a447b9156987c0b2e83051e5ce336eb096c8 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -553,10 +553,8 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
                eap_peap_soh_verify(fake, data, data_len);
                setup_fake_request(request, fake, t);
 
-               if (t->soh_virtual_server) fake->server_cs = virtual_server_find(t->soh_virtual_server);
+//             if (t->soh_virtual_server) fake->server_cs = virtual_server_find(t->soh_virtual_server);
 
-               RDEBUG2("Sending SoH request to server %s",
-                      fake->server_cs ? cf_section_name2(fake->server_cs) : "NULL");
                rad_virtual_server(&rcode, fake);
 
                if (fake->reply->code != FR_RADIUS_CODE_ACCESS_ACCEPT) {