Use the fr_strerror() logging macros

diff --git a/src/main/exec.c b/src/main/exec.c
index 37a26a4b0701d2324f3a08daad924d69e98cf053..7b7a314ad26659423bf9a30694d423a127d69cb8 100644 (file)
--- a/src/main/exec.c
+++ b/src/main/exec.c
@@ -113,11 +113,7 @@ pid_t radius_start_program(char const *cmd, REQUEST *request, bool exec_wait,
        memcpy(&argv_p, &argv_start, sizeof(argv_p));
        argc = rad_expand_xlat(request, cmd, MAX_ARGV, argv_p, true, sizeof(argv_buf), argv_buf);
        if (argc <= 0) {
-               if (request) {
-                       REDEBUG("Invalid command '%s' - %s", cmd, fr_strerror());
-               } else {
-                       ERROR("Invalid command '%s' - %s", cmd, fr_strerror());
-               }
+               ROPTIONAL(RPEDEBUG, PERROR, "Invalid command '%s'", cmd);
                return -1;
        }
 

diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 363ac7f8d9064bf6b2c5f1029a67db67b784bad0..7814856534e07d8d55f612a70e9c1c20c3762c37 100644 (file)
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -208,7 +208,7 @@ static ssize_t redis_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen,
 
                argc = rad_expand_xlat(request, p, MAX_REDIS_ARGS, argv, false, sizeof(argv_buf), argv_buf);
                if (argc <= 0) {
-                       REDEBUG("Invalid command: %s - %s", p, fr_strerror());
+                       RPEDEBUG("Invalid command: %s", p);
                        fr_pool_connection_release(pool, request, conn);
                        return -1;
                }
@@ -253,7 +253,7 @@ static ssize_t redis_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen,
         */
        argc = rad_expand_xlat(request, p, MAX_REDIS_ARGS, argv, false, sizeof(argv_buf), argv_buf);
        if (argc <= 0) {
-               REDEBUG("Invalid command: %s - %s", p, fr_strerror());
+               RPEDEBUG("Invalid command: %s", p);
                ret = -1;
                goto finish;
        }

diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index 5f353a4e635d3ec529e14049e300b9f817fe2c8d..ff25edbb4493a4c0ab883f891bc31bf30692c99d 100644 (file)
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -101,7 +101,7 @@ static int rediswho_command(rlm_rediswho_t const *inst, REQUEST *request, char c
 
        argc = rad_expand_xlat(request, fmt, MAX_REDIS_ARGS, argv, false, sizeof(argv_buf), argv_buf);
        if (argc < 0) {
-               REDEBUG("Invalid command: %s - %s", fmt, fr_strerror());
+               RPEDEBUG("Invalid command: %s", fmt);
                return -1;
        }