From: Alan T. DeKok Date: Sun, 29 Apr 2018 00:35:22 +0000 (-0400) Subject: just use "filename" X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7d560e99bc92cdd2215b8b235ed4f32c5341a0;p=thirdparty%2Ffreeradius-server.git just use "filename" --- diff --git a/raddb/sites-available/detail b/raddb/sites-available/detail index 883a2660a83..4df3beb41fc 100644 --- a/raddb/sites-available/detail +++ b/raddb/sites-available/detail @@ -133,7 +133,7 @@ server detail { # The best way to enforce that is to give the # the files different prefixes. # - filename.work = "${confdir}/detail.work" + filename = "${confdir}/detail.work" # # Track progress through the detail file. When the detail diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c index 4f9ea01fb15..eb1fd194197 100644 --- a/src/modules/proto_detail/proto_detail_file.c +++ b/src/modules/proto_detail/proto_detail_file.c @@ -63,7 +63,7 @@ static void mod_vnode_delete(fr_event_list_t *el, int fd, UNUSED int fflags, voi static const CONF_PARSER file_listen_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_STRING | FR_TYPE_REQUIRED, proto_detail_file_t, filename ) }, - { FR_CONF_OFFSET("filename.work", FR_TYPE_STRING, proto_detail_work_t, filename_work ) }, + { FR_CONF_OFFSET("filename_work", FR_TYPE_STRING, proto_detail_work_t, filename_work ) }, { FR_CONF_OFFSET("poll_interval", FR_TYPE_UINT32, proto_detail_file_t, poll_interval), .dflt = "5" }, diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c index 313492b901a..292f65eaf86 100644 --- a/src/modules/proto_detail/proto_detail_work.c +++ b/src/modules/proto_detail/proto_detail_work.c @@ -75,7 +75,7 @@ static CONF_PARSER limit_config[] = { static const CONF_PARSER file_listen_config[] = { - { FR_CONF_OFFSET("filename.work", FR_TYPE_STRING | FR_TYPE_REQUIRED, proto_detail_work_t, filename_work ) }, + { FR_CONF_OFFSET("filename", FR_TYPE_STRING | FR_TYPE_REQUIRED, proto_detail_work_t, filename_work ) }, { FR_CONF_OFFSET("track", FR_TYPE_BOOL, proto_detail_work_t, track_progress ) },