minor tweaks

diff --git a/src/modules/rlm_radius2/bio.c b/src/modules/rlm_radius2/bio.c
index 41cc9ef32a1e2a32c481a4b378814944ac13d95f..89b4aa7b8d38ea9cdd7af85eb5de829070f6e0a4 100644 (file)
--- a/src/modules/rlm_radius2/bio.c
+++ b/src/modules/rlm_radius2/bio.c
@@ -435,7 +435,7 @@ static void conn_readable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE
        uint8_t                 code = 0;
 
        fr_pair_list_init(&reply);
-       slen = read(h->fd, h->buffer, h->buflen);
+       slen = fr_bio_read(h->bio.read, NULL, h->buffer, h->buflen);
        if (slen == 0) return;
 
        if (slen < 0) {
@@ -911,14 +911,14 @@ static connection_t *thread_conn_alloc(trunk_connection_t *tconn, fr_event_list_
 /** Read and discard data
  *
  */
-static void conn_discard(UNUSED fr_event_list_t *el, int fd, UNUSED int flags, void *uctx)
+static void conn_discard(UNUSED fr_event_list_t *el, UNUSED int fd, UNUSED int flags, void *uctx)
 {
        trunk_connection_t      *tconn = talloc_get_type_abort(uctx, trunk_connection_t);
        bio_handle_t            *h = talloc_get_type_abort(tconn->conn->h, bio_handle_t);
        uint8_t                 buffer[4096];
        ssize_t                 slen;
 
-       while ((slen = read(fd, buffer, sizeof(buffer))) > 0);
+       while ((slen = fr_bio_read(h->bio.read, NULL, buffer, sizeof(buffer))) > 0);
 
        if (slen < 0) {
                switch (errno) {

diff --git a/src/modules/rlm_radius2/rlm_radius.c b/src/modules/rlm_radius2/rlm_radius.c
index f6dccef1810b02efdecff58105e6d9c9f53141d0..40d5f4d14ea6a04178f80ef63a0dc59c17bf61f9 100644 (file)
--- a/src/modules/rlm_radius2/rlm_radius.c
+++ b/src/modules/rlm_radius2/rlm_radius.c
@@ -128,7 +128,7 @@ static conf_parser_t const module_config[] = {
        { FR_CONF_OFFSET_FLAGS("type", CONF_FLAG_NOT_EMPTY | CONF_FLAG_MULTI | CONF_FLAG_REQUIRED, rlm_radius_t, types),
          .func = type_parse },
 
-       { FR_CONF_OFFSET_FLAGS("replicate", 0, rlm_radius_t, replicate) },
+       { FR_CONF_OFFSET_FLAGS("replicate", CONF_FLAG_DEPRECATED, rlm_radius_t, replicate) },
 
        { FR_CONF_OFFSET_FLAGS("synchronous", CONF_FLAG_DEPRECATED, rlm_radius_t, synchronous) },
 
@@ -610,7 +610,7 @@ check_others:
                inst->fd_config.flags = O_WRONLY | O_APPEND;
 
        } else if (inst->fd_config.filename) {
-               cf_log_err(conf, "When using an output 'filename', you MUST set 'replicate = true'");
+               cf_log_err(conf, "When using an output 'filename', you MUST set 'mode = replicate'");
                return -1;
 
        } else {
@@ -644,11 +644,6 @@ check_others:
                        cf_log_err(conf, "Cannot set 'src_port' when using 'mode = unconnected'");
                        return -1;
                }
-
-               if (!inst->replicate) {
-                       cf_log_err(conf, "Using 'mode = unconnected' also requires 'replicate = true'");
-                       return -1;
-               }
        }
 
        FR_TIME_DELTA_BOUND_CHECK("response_window", inst->zombie_period, >=, fr_time_delta_from_sec(1));