remove LOG_PREFIX_ARGS, and just use LOG_PREFIX everywhere

which simplifies things, in preparation for adding log IDs
everywhere, too.

diff --git a/src/lib/eap/base.c b/src/lib/eap/base.c
index 0337791e199fa384e4aa9f8146f8c46f9a944dd8..cfd1d2118d5cb764ad3316596f64fddb02cd6abb 100644 (file)
--- a/src/lib/eap/base.c
+++ b/src/lib/eap/base.c
@@ -60,7 +60,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap - "
+#define LOG_PREFIX "rlm_eap"
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/server/virtual_servers.h>

diff --git a/src/lib/eap/compose.c b/src/lib/eap/compose.c
index f97db78431a0c97d80c97d388ff6ed3003ca2fa1..9e083a5e147ebe8b1c659590c83002f55a440fd1 100644 (file)
--- a/src/lib/eap/compose.c
+++ b/src/lib/eap/compose.c
@@ -53,7 +53,7 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *
  */
-#define LOG_PREFIX "rlm_eap - "
+#define LOG_PREFIX "rlm_eap"
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/radius/radius.h>

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 771d979bbc599a2a78380cfa95381ee0e5102a01..e363810d0035deccd099f86861c600e049808cd0 100644 (file)
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS nr->name
+#define LOG_PREFIX nr->name
 
 #define LOG_DST nr->log
 

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 8fecb7b735a963a94a29fbb759538f8b1ef556cf..f4d6315a0b08912695dcd994660b63de074f64a9 100644 (file)
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -48,8 +48,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS worker->name
+#define LOG_PREFIX worker->name
 #define LOG_DST worker->log
 
 #include <freeradius-devel/io/channel.h>

diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index f1d4fbc79dbe48daf5a9e42706eb7abfcb1ebaa2..26f8ecea6ec3046fa3eb3b5a46b8d8d91c66bf8e 100644 (file)
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -30,8 +30,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/util/debug.h>
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS handle_config->name
+#define LOG_PREFIX handle_config->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/ldap/base.h>

diff --git a/src/lib/ldap/directory.c b/src/lib/ldap/directory.c
index c24e017542c13c649c91646f8a74f20913267043..d40f02b06bacbc18c202a7b1de842d0e91639e22 100644 (file)
--- a/src/lib/ldap/directory.c
+++ b/src/lib/ldap/directory.c
@@ -28,8 +28,7 @@ RCSID("$Id$")
 
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS name
+#define LOG_PREFIX name
 
 #include <freeradius-devel/ldap/base.h>
 

diff --git a/src/lib/ldap/sasl_s.c b/src/lib/ldap/sasl_s.c
index 7e60c64bdd09367408c2f52f2ad6416a33afb904..d5eb92154c09aaa1ac956a826cb7c79e5ecea91b 100644 (file)
--- a/src/lib/ldap/sasl_s.c
+++ b/src/lib/ldap/sasl_s.c
@@ -27,8 +27,7 @@ RCSID("$Id$")
 
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS handle_config->name
+#define LOG_PREFIX handle_config->name
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/base.h>

diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c
index 079a6f75bb31443471b0e1a763cc328308ac9569..5dad7381c3e06fa770427ec8d697088eff4d556c 100644 (file)
--- a/src/lib/server/connection.c
+++ b/src/lib/server/connection.c
@@ -22,8 +22,7 @@
  *
  * @copyright 2017-2019 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "%s "
-#define LOG_PREFIX_ARGS conn->pub.name
+#define LOG_PREFIX conn->pub.name
 
 typedef struct fr_connection_s fr_connection_t;
 #define _CONNECTION_PRIVATE 1

diff --git a/src/lib/server/log.h b/src/lib/server/log.h
index 8906d79c2e6861b8d808dd82b05ec2c2de3948da..864750de038002404513d0e60813c7ebfc162303 100644 (file)
--- a/src/lib/server/log.h
+++ b/src/lib/server/log.h
@@ -183,19 +183,16 @@ void      log_global_free(void);
  *  The prefix is set with LOG_PREFIX, and arguments may
  *  be passed with LOG_PREFIX_ARGS
  */
-#ifndef LOG_PREFIX
-#  define LOG_PREFIX ""
-#endif
-#ifdef LOG_PREFIX_ARGS
-#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, LOG_PREFIX, LOG_PREFIX_ARGS)
+#ifdef LOG_PREFIX
+#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, "%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, "%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL("%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, "%s", LOG_PREFIX)
 #else
-#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, LOG_PREFIX)
+#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, _fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, _fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(_fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, "")
 #endif
 
 /** @name Log global messages

diff --git a/src/lib/server/pool.c b/src/lib/server/pool.c
index f40bd2d415f7659c5796fb4b29d33954c4007eb6..dcf244f7ece5f73dca761d0059ef11e9b51a43d2 100644 (file)
--- a/src/lib/server/pool.c
+++ b/src/lib/server/pool.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS pool->log_prefix
+#define LOG_PREFIX pool->log_prefix
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>

diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 8e374483f6d904c26efe28329002eb2414e530db..8d4644814568a4db741c86d33699c2571e8c7a92 100644 (file)
--- a/src/lib/server/trunk.c
+++ b/src/lib/server/trunk.c
@@ -24,8 +24,7 @@
  * @copyright 2019-2020 The FreeRADIUS server project
  */
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS trunk->log_prefix
+#define LOG_PREFIX trunk->log_prefix
 
 #ifdef NDEBUG
 #  define TALLOC_GET_TYPE_ABORT_NOOP 1

diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 0ff2963b35b777fd2b1eda9a6e37df41e14fee9b..f754a475da172aa985e6cc69531934d6755ea75b 100644 (file)
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/conf.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index ae63cf91c83a5cf4d0a2a58c872e30cb60f00bd7..824393857e5eb8703e5a59542ffa467851c51b50 100644 (file)
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/ssl.h>
 

diff --git a/src/lib/tls/cert.c b/src/lib/tls/cert.c
index fd01bd9bd797de19d6b9e693d00a1af5140f1954..3ad4e2554838f12b398b9f7a20bbab77791dd3e2 100644 (file)
--- a/src/lib/tls/cert.c
+++ b/src/lib/tls/cert.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/ssl.h>
 

diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c
index c78a05168347b22f7b4977edf0124cc2e58c5978..65f8643d32118045690c72de861b2a1c12493d16 100644 (file)
--- a/src/lib/tls/conf.c
+++ b/src/lib/tls/conf.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>

diff --git a/src/lib/tls/ctx.c b/src/lib/tls/ctx.c
index 6b469f482da3f9332ee9164160227b1927f16048..e433ab60e6a47587ebe21292d9d677016241a185 100644 (file)
--- a/src/lib/tls/ctx.c
+++ b/src/lib/tls/ctx.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/tls/log.h>
 #include <freeradius-devel/util/base16.h>

diff --git a/src/lib/tls/engine.c b/src/lib/tls/engine.c
index a87991e4b968e1fea479bb93365f0136f6a4114e..9a86e669ec1682e6ed34d50829323facd5b634f8 100644 (file)
--- a/src/lib/tls/engine.c
+++ b/src/lib/tls/engine.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/engine.h>

diff --git a/src/lib/tls/log.c b/src/lib/tls/log.c
index 9a8049035a9c09a3ce2aea70dcdb563d192c0997..bf608b61f9414ce7a054e66d150d859c70917b9e 100644 (file)
--- a/src/lib/tls/log.c
+++ b/src/lib/tls/log.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/lib/tls/pairs.c b/src/lib/tls/pairs.c
index 50709a1430f41ad56787a62b2830b46bace53b5c..c86abfcf4d2908e7e506d1901a3ac4df14e5b865 100644 (file)
--- a/src/lib/tls/pairs.c
+++ b/src/lib/tls/pairs.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/x509v3.h>
 #include <openssl/ssl.h>

diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index e4d9b32b79eb877e6de8efd91f7dc9b79b9e66ba..0776c3240aba03bf0a4561f56ad580f25c9d3f79 100644 (file)
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -25,7 +25,7 @@
  * @copyright 2006-2016 The FreeRADIUS server project
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/pair.h>
 

diff --git a/src/lib/tls/verify.c b/src/lib/tls/verify.c
index 65d44017eaa7df7f70a915b4751aa464b88291ea..3b78ded25db574bd168355f911e5670a8cedd016 100644 (file)
--- a/src/lib/tls/verify.c
+++ b/src/lib/tls/verify.c
@@ -26,7 +26,7 @@
  * @copyright 2006-2016 The FreeRADIUS server project
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/exec.h>
 #include <freeradius-devel/server/pair.h>

diff --git a/src/lib/tls/virtual_server.c b/src/lib/tls/virtual_server.c
index fc338d7041e66df592617578b6c428a77ead60be..ca4bd7203bac590b765fb20e9f44fe297dbce304 100644 (file)
--- a/src/lib/tls/virtual_server.c
+++ b/src/lib/tls/virtual_server.c
@@ -23,7 +23,7 @@
  * @copyright 2021 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/unlang/call.h>

diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index 362ecda228560da788b11f95182ef7c1181c06c9..32da21adb666e911fa827dcd91b6a48c34bf43d2 100644 (file)
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -65,7 +65,7 @@ DIAG_ON(strict-prototypes)
 #endif /* HAVE_READLINE_HISTORY */
 #endif /* HAVE_LIBREADLINE */
 
-#define LOG_PREFIX "radmin - "
+#define LOG_PREFIX "radmin"
 
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/cf_file.h>

diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index 4b209d5dbdaee61beb2e3e33b96c9e4ac83007f0..e3ba7ac6e8beb84f1d84928eb5404aed3de8f767 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -22,7 +22,7 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#define LOG_PREFIX "proto_dhcpv4 - "
+#define LOG_PREFIX "proto_dhcpv4"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index c4725cf4c0dfce25207593e50789fcd77560dc97..5eb49fe21fc4a9f165235be31d55ffcca87181bd 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -22,7 +22,7 @@
  * @copyright 2018 The FreeRADIUS server project.
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv4_udp - "
+#define LOG_PREFIX "proto_dhcpv4_udp"
 
 #include <netdb.h>
 #include <freeradius-devel/server/protocol.h>

diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 71faca50c4dcd999d7a3d2ed1ad906b7d3bab052..ec04ef8377df8b8bfe6a59437898d796800bae8b 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv6 - "
+#define LOG_PREFIX "proto_dhcpv6"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 29b52af0fd759261ed163dd696b804298deec884..a894c88f88f9ecc6267098e68f92f3ac2d590c33 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv6_udp - "
+#define LOG_PREFIX "proto_dhcpv6_udp"
 
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>

diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index e2ede7df655407ec1b58c6b3137d9d292ddc5f74..5adef38f77979313251e4af4516ac0bb05fa389d 100644 (file)
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dns - "
+#define LOG_PREFIX "proto_dns"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 76bbd38a1a26b5fab15b53f686420c2242b72af6..17fe82441f30e1231f8d0fe4a752f2f37a016980 100644 (file)
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dns_udp - "
+#define LOG_PREFIX "proto_dns_udp"
 
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>

diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index c30f89ca9899ec79771245d77d8b29aaa8732e08..0548621b8e91407ba891068953c6d39ef862e1a1 100644 (file)
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index d7b52ec077c653be6d40079b52210833572ea02d..a451826b93b87d94ad91f6bf08469f1a980d020c 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include       <freeradius-devel/server/base.h>
 #include       <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 4aa96793d728e52473abec4e120912188c8a6f9f..23ff48213e4247615db9044b1a6a367d561d27ca 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -22,7 +22,7 @@
  * @copyright 2014 The FreeRADIUS server project
  */
 
-#define LOG_PREFIX "rlm_cache_memcached - "
+#define LOG_PREFIX "rlm_cache_memcached"
 
 #include <libmemcached/memcached.h>
 

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index bd39048e7cee6434afad0b4d6133335143cda4a3..1b03e1529dd77369f2a473c686ac5418bebd0169 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_cache_redis - "
+#define LOG_PREFIX "rlm_cache_redis"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 94b0bcbfc8d8b7570b5288b853d8c4b6efeb73f0..855338a72f7eb23c546a3462d0bf9aac803db19f 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->config.name
+#define LOG_PREFIX inst->config.name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 42fc5d5427418f25784678a668df9dbfc7363631..45dfdc40ac7ab915479cb9beb8ffe5c0a54a9819 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/password.h>

diff --git a/src/modules/rlm_couchbase/couchbase.c b/src/modules/rlm_couchbase/couchbase.c
index 0cf09516490c765fe5db3f5c098e3cddcb779a2b..b33f43ba079f2ad6c23ff6af9e215de22196ea74 100644 (file)
--- a/src/modules/rlm_couchbase/couchbase.c
+++ b/src/modules/rlm_couchbase/couchbase.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase - "
+#define LOG_PREFIX "rlm_couchbase"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/json/base.h>

diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index 8e20208d2a5b3a925e34e60a4305184497588807..b1a16e0032a1df70b7f9454d2d9c7cee1fa0cec1 100644 (file)
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase - "
+#define LOG_PREFIX "rlm_couchbase"
 
 #include <freeradius-devel/json/base.h>
 #include <freeradius-devel/server/base.h>

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index 41588093a8d8d17956a62c1a75029bb72588cd2b..07ae5043d84f0edd5656b2ff78eb413120d5bd95 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase - "
+#define LOG_PREFIX "rlm_couchbase"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map.h>

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 96547f3b20d58fe33b73bf4fa1923dbca5db5449..8962f445f038706fef7876b6fdf503b2382d003f 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_detail (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 07a3b2c9a35c49085ed8aef12602a9a86d63f464..760c6adf6a185cbe59f8ba3862763cb0268237fa 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 59e4c319fda023fe8525a9df612357aecd7db4da..1982ffdc16668dc02a220aff80825e91507a6075 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_gtc - "
+#define LOG_PREFIX "rlm_eap_gtc"
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
index 9956817322650fd2c4ae7bad8bab999847b26e15..c0b30e57e38bcd323565149b127b0477e34f1e65 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
@@ -36,7 +36,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_md5 - "
+#define LOG_PREFIX "rlm_eap_md5"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index e7274d3ddaf5608b6114b4fe8933d2a020509ae3..8c075a72c70cc2c903854d1f5b17f0dfc9109c51 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -22,7 +22,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_peap - "
+#define LOG_PREFIX "rlm_eap_peap"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_peap.h"

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index f4b7a0449407e8f5336e9d960015eb5577c87363..253ff664fcd1c62196f5df8ce6af1a0f9542d560 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -33,7 +33,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_pwd - "
+#define LOG_PREFIX "rlm_eap_pwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 8bc653e322790c2d2a1c9e92ab00eecbb5baff36..1b6874631d3a7f84cbe9fb1d328569ec2614c9a7 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_tls - "
+#define LOG_PREFIX "rlm_eap_tls"
 
 #ifdef HAVE_OPENSSL_RAND_H
 #  include <openssl/rand.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 5e9b1be7ef0b34bfe2b9e3fe0079dbcda11b2434..37697d839afe2a4326d43c3245a78d52c62f0fde 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_ttls - "
+#define LOG_PREFIX "rlm_eap_ttls"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_ttls.h"

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 908496ed5da0e58dbc262b80838f4ff00c674c11..c051563043d25ffe10f1ae3c93fde6e53e5efcb5 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_exec (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index 97ff433cc2d91ccba38e0b097b61b95c838dd70c..38102561b89f22af41b2b0cdc6b3f66b8df3ace3 100644 (file)
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_icmp (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_krb5/krb5.c b/src/modules/rlm_krb5/krb5.c
index bb771257ba88502cd0ad922dc89bbf46fd976ea1..9d1809d2c9ebbc8ea0d269f39b22480c45810bd2 100644 (file)
--- a/src/modules/rlm_krb5/krb5.c
+++ b/src/modules/rlm_krb5/krb5.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_krb5 (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/base.h>

diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 3d225b30291d370cbebbfefcc983fb1d8b9fee97..65555cc3524a216132a34178a60a8f13d6869a5e 100644 (file)
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -26,8 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_krb5 (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index f8f14578cbea5f9eca7884be045af951a7079d55..4c1ba3b3414d1bdc20557e061df8d73485ee8816 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -31,8 +31,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/util/debug.h>
 #include <ctype.h>
 
-#define LOG_PREFIX "rlm_ldap (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_ldap.h"
 

diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c
index d8e2a0be728d50aa1ef18d75acab274cb542e98b..68a264ff2d310fd8ee1241dabcbda19b10b736c2 100644 (file)
--- a/src/modules/rlm_ldap/user.c
+++ b/src/modules/rlm_ldap/user.c
@@ -31,8 +31,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/util/debug.h>
 #include <ctype.h>
 
-#define LOG_PREFIX "rlm_ldap (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_ldap.h"
 

diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index d2b280a0947bfd661970dfd8073fa3d774d755bb..3222f7f486d6b93320fe1ffed7b25cc788a46c61 100644 (file)
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c
index 21cdf9a239bfe0f10e658d2b9a068a0820d64b63..65ef8d8ca1d5c1c381b1f8b548f0a34785fbb69b 100644 (file)
--- a/src/modules/rlm_lua/rlm_lua.c
+++ b/src/modules/rlm_lua/rlm_lua.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_lua/util.c b/src/modules/rlm_lua/util.c
index d57c0b8d09e365806abe2163f84bfbe036810fa6..6f5842b99605906705a638a907f74293ab7107c4 100644 (file)
--- a/src/modules/rlm_lua/util.c
+++ b/src/modules/rlm_lua/util.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index a8a8426183798c5fb7dae7317c0bd43a509d672a..65b7b0b5431854094a307cdf9a5f47eef8448f53 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -25,8 +25,7 @@
 /*  MPPE support from Takahiro Wagatsuma <waga@sic.shibaura-it.ac.jp> */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exec_legacy.h>

diff --git a/src/modules/rlm_ocsp/ocsp.c b/src/modules/rlm_ocsp/ocsp.c
index afde51886313497298f7098328f770f5f019a52e..0bc952e31463796da801acdd90ddcd931fea6243 100644 (file)
--- a/src/modules/rlm_ocsp/ocsp.c
+++ b/src/modules/rlm_ocsp/ocsp.c
@@ -28,7 +28,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #ifdef WITH_TLS
 #undef HAVE_OPENSSL_OCSP_H
 #ifdef HAVE_OPENSSL_OCSP_H
-#define LOG_PREFIX "tls - ocsp - "
+#define LOG_PREFIX "tls - ocsp"
 
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/pair.h>

diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index 6d415ac288b48c9871e6b7b6ea5a2358bfb0b1ba..52b561a88f05a20f0ebe0909a17e02da7ab8a6a8 100644 (file)
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_passwd - "
+#define LOG_PREFIX "rlm_passwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 55dcd75f69f96e34f138cd9a5c5c44b7fdbc908f..3c016a6b9d9b3e95db673ca721186c81a3620694 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_perl - "
+#define LOG_PREFIX "rlm_perl"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index cd42b8cd4171fae0615614950701eba1ad70ec39..9228b81691b9dd67a723c9acbe9849196ae89ae2 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -27,8 +27,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_python (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 6a080c587a47d46ca5c2d494830cd234c969c91c..6bf23516e1d73ccb848da02b134a6088b1f89ed0 100644 (file)
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -25,8 +25,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_rest (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <ctype.h>
 #include <string.h>

diff --git a/src/modules/rlm_securid/mem.c b/src/modules/rlm_securid/mem.c
index c325887a29ff5d349ea3c122b04c3b2984a852d2..f48294f29f45b6e3595a4683ba84f8e1b5c1bb22 100644 (file)
--- a/src/modules/rlm_securid/mem.c
+++ b/src/modules/rlm_securid/mem.c
@@ -19,7 +19,7 @@
  * @copyright 2012 Alan DeKok (aland@networkradius.com)
  */
 
-#define LOG_PREFIX "rlm_securid - "
+#define LOG_PREFIX "rlm_securid"
 
 #include <stdio.h>
 #include "rlm_securid.h"

diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index b5bd140fc5862e160ef94a22264e6e003396ca4e..ce7bb848b988088ea0f63f7daa551a04a1af64f4 100644 (file)
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sigtran/event.c b/src/modules/rlm_sigtran/event.c
index a887c59bc9eb303fb2352966c6184cfbdc4cef8b..4655a15ce977132fc6b23f4333bf3fb3f8a407ad 100644 (file)
--- a/src/modules/rlm_sigtran/event.c
+++ b/src/modules/rlm_sigtran/event.c
@@ -56,7 +56,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <osmocom/core/talloc.h>
 

diff --git a/src/modules/rlm_sigtran/log.c b/src/modules/rlm_sigtran/log.c
index 68c79367455f7bfe600c05edb1d3b7cec29490c8..f603b77d2ec20b505e06300d5d5c5705b6a32a23 100644 (file)
--- a/src/modules/rlm_sigtran/log.c
+++ b/src/modules/rlm_sigtran/log.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/log.c
  * @brief Interface libosmo with FreeRADIUS logging
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <osmocom/core/logging.h>

diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c
index 4647f56ad4ec6fc2df3c86119c2fd707aedf1792..b6857aaa6cf381491b03c13f5aa17777f7509348 100644 (file)
--- a/src/modules/rlm_sigtran/rlm_sigtran.c
+++ b/src/modules/rlm_sigtran/rlm_sigtran.c
@@ -34,7 +34,6 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sigtran (%s) - "
 #define LOG_PREFIX_ARGS inst->name
 
 #include <osmocom/core/linuxlist.h>

diff --git a/src/modules/rlm_sigtran/sccp.c b/src/modules/rlm_sigtran/sccp.c
index d9f41310b73843a3a5d452da85cc787eff82b413..70d3f9f5612ac0dc11555f615adad80e3aa69f6b 100644 (file)
--- a/src/modules/rlm_sigtran/sccp.c
+++ b/src/modules/rlm_sigtran/sccp.c
@@ -34,7 +34,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran - osmocom thread - "
+#define LOG_PREFIX "rlm_sigtran - osmocom thread"
 
 #include <osmocom/core/talloc.h>
 

diff --git a/src/modules/rlm_sigtran/sigtran.c b/src/modules/rlm_sigtran/sigtran.c
index c8b1b560a415341567895e81172ce0b2f42117a1..ecd2cafee2bcbcf0847f47825be975c43a531fb7 100644 (file)
--- a/src/modules/rlm_sigtran/sigtran.c
+++ b/src/modules/rlm_sigtran/sigtran.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/sigtran.c
  * @brief Miscellaneous functions.
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/talloc.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 686909270e43e3bb3e7ae3cbe58ae8f55e7a5464..ef705fac4362cf3d4cf4979bbf5c0296d893bb88 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -33,7 +33,7 @@
  * @author Linnaea Von Lavia (le.concorde.4590@gmail.com)
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_sql_cassandra - "
+#define LOG_PREFIX "rlm_sql_cassandra"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index a52b89e3941297527e6acbe575a0b2562fed8d52..9f09a636c734899fe347d8d08f749b73008f9d88 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -29,7 +29,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_db2 - "
+#define LOG_PREFIX "rlm_sql_db2"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
index d7e82cacc5e1d6f041f2e7b23a9f08f27a1a33ee..b57834245113a9ced2e0fd1d39c08a3baecec3be 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
@@ -20,7 +20,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_firebird - "
+#define LOG_PREFIX "rlm_sql_firebird"
 
 #include "sql_fbapi.h"
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
index 9492abcbdcaad87ca6fefe893c94f6b75e4f0e09..9314c712b42af4c9ee1509720fb1cf204aeb140c 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_freetds - "
+#define LOG_PREFIX "rlm_sql_freetds"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index 3da432ad69b4415192964ffd2555f6e40abc24c0..b2eb664eed0b27aa8fc3d9cdaef8d79d97e6b093 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -26,7 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_mysql - "
+#define LOG_PREFIX "rlm_sql_mysql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 689ec58e1dfff413da9c9560dcfd6ed561370e80..4e11f4423aa72162641d502a7e68bd493b69a97d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -22,7 +22,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_oracle - "
+#define LOG_PREFIX "rlm_sql_oracle"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 9d597feeff7ebd753e1b7364002319539a0aceff..363d55a908ec41ff36bd2442dd482705ba56926f 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -39,7 +39,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_postgresql - "
+#define LOG_PREFIX "rlm_sql_postgresql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 85896bf63599dbc301f071aad30380ff3eb46841..3a810865002a69e44163cadacebf2e28dbb4b0b8 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_sqlite - "
+#define LOG_PREFIX "rlm_sql_sqlite"
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
index c2a414d25723132fa675ac0ae23cc39ccf99734f..91d760c0501f46b3c27cd1367853303491ec8738 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
@@ -21,7 +21,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "rlm_sql_unixodbc - "
+#define LOG_PREFIX "rlm_sql_unixodbc"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 726549d80ecdebc0f8f4ce7a4a04e75f3fc6f3a9..e6c5e52adefa1ca2853168e609811769827bd784 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -26,8 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <ctype.h>
 

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 78e7b380c97b2be3b601a6f47a05433bc35c9e82..ae8bc1b9e6cbf20864d521ae79a4885d8372ea5e 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -26,8 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include       <freeradius-devel/server/base.h>
 #include       <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index cac968b21da76cf1cdeb7566946b00e8b7ff2ebc..ebd53d0e09350ce2c712c86f69a5eb82481ffb15 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sqlcounter - "
+#define LOG_PREFIX "rlm_sqlcounter"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 2d99e032a11b513f14d08cb5b794a34832f2143e..a92fb15b3fd71892ea044ef4bd2b81c0e93a00d7 100644 (file)
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_ippool (%s) - "
-#define LOG_PREFIX_ARGS inst->sql_instance_name
+#define LOG_PREFIX inst->name
 
 #include <rlm_sql.h>
 #include <freeradius-devel/util/debug.h>
@@ -41,6 +40,7 @@ RCSID("$Id$")
  *     Define a structure for our module configuration.
  */
 typedef struct {
+       char const      *name;
        char const      *sql_instance_name;
 
        uint32_t        lease_duration;
@@ -397,6 +397,19 @@ finish:
        return retval;
 }
 
+static int mod_bootstrap(void *instance, CONF_SECTION *conf)
+{
+       rlm_sqlippool_t *inst = instance;
+       char const *name;
+
+       name = cf_section_name2(conf);
+       if (!name) name = cf_section_name1(conf);
+
+       inst->name = talloc_asprintf(inst, "%s - %s", name, inst->sql_instance_name);
+
+       return 0;
+}
+
 /*
  *     Do any per-module initialization that is separate to each
  *     configured instance of the module.  e.g. set up connections
@@ -850,6 +863,7 @@ module_t rlm_sqlippool = {
        .type           = RLM_TYPE_THREAD_SAFE,
        .inst_size      = sizeof(rlm_sqlippool_t),
        .config         = module_config,
+       .bootstrap      = mod_bootstrap,
        .instantiate    = mod_instantiate,
        .methods = {
                [MOD_ACCOUNTING]        = mod_accounting,

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 1d8d39e4abe620d45ba0048cdd03e4f85c05af58..c16ed511e0e2ef83c65b333b025bf8b46d483ecc 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_test - "
+#define LOG_PREFIX "rlm_test"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_unbound/io.c b/src/modules/rlm_unbound/io.c
index aaf301f4a2738dc8dd24a1bc420227e72a845d8f..2f0de566517927cb7cf45a916c4b258cae52443e 100644 (file)
--- a/src/modules/rlm_unbound/io.c
+++ b/src/modules/rlm_unbound/io.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound - "
+#define LOG_PREFIX "rlm_unbound"
 
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/event.h>

diff --git a/src/modules/rlm_unbound/log.c b/src/modules/rlm_unbound/log.c
index 789ee12ce989a8f8a9f421239559d831dd215f89..1000fd47122affa4813e8b4e79278c273f33f45d 100644 (file)
--- a/src/modules/rlm_unbound/log.c
+++ b/src/modules/rlm_unbound/log.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound - "
+#define LOG_PREFIX "rlm_unbound"
 
 #include <freeradius-devel/util/syserror.h>
 #include "log.h"

diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index dc4699fa7477af758722e6b38390e1c36b941a4c..ebedb21f65cd916c75224887ca5ef2487715867d 100644 (file)
--- a/src/modules/rlm_unbound/rlm_unbound.c
+++ b/src/modules/rlm_unbound/rlm_unbound.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound - "
+#define LOG_PREFIX "rlm_unbound"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 4cd9bb3eac20308597f186f1dcf9365fcc719ea9..337b95ec06da6e576727dfa9aee74fcec7f5fa5c 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -30,8 +30,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "rlm_unix (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/server/base.h>

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index c4d27a2fd318f9f6f7187403640d5fbd4de66acc..cd16e972a79688252c106b8859c967ebb42e1537 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_wimax - "
+#define LOG_PREFIX "rlm_wimax"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/modules/rlm_yubikey/validate.c b/src/modules/rlm_yubikey/validate.c
index de56b5b1dc7480925b58dc7057d0c13ea72aa310..df9b0ed2516c0ff7265a543627b6826c4ee9a2d5 100644 (file)
--- a/src/modules/rlm_yubikey/validate.c
+++ b/src/modules/rlm_yubikey/validate.c
@@ -7,8 +7,7 @@
  * @copyright 2013 The FreeRADIUS server project
  * @copyright 2013 Network RADIUS (legal@networkradius.com)
  */
-#define LOG_PREFIX "rlm_yubikey (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_yubikey.h"
 

diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index 6a549a0f13d185176d156f9208c77073e5d3bab8..3b791063e6948e83faa7c80b5e582603dca12ea6 100644 (file)
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -22,7 +22,7 @@
  * @copyright 2018 The Freeradius server project.
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
-#define LOG_PREFIX "process_dhcpv4 - "
+#define LOG_PREFIX "process_dhcpv4"
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>