From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 20 Apr 2018 04:21:49 +0000 (+1200)
Subject: Use the fr_strerror() logging macros
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb58d010db4e477960a079ee8db534472b0610b;p=thirdparty%2Ffreeradius-server.git

Use the fr_strerror() logging macros
---

diff --git a/src/main/exec.c b/src/main/exec.c
index 37a26a4b070..7b7a314ad26 100644
--- 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 363ac7f8d90..7814856534e 100644
--- 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 5f353a4e635..ff25edbb449 100644
--- 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;
 	}