From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 4 Nov 2019 14:23:27 +0000 (-0600)
Subject: Only one more bad use of vp_strvalue to go...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e25f1efa03a8af2f5eacbe50144be478158d6f44;p=thirdparty%2Ffreeradius-server.git

Only one more bad use of vp_strvalue to go...
---

diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c
index b420044696f..2d71ad475e4 100644
--- a/src/lib/server/paircmp.c
+++ b/src/lib/server/paircmp.c
@@ -137,7 +137,7 @@ static int prefix_suffix_cmp(UNUSED void *instance,
 
 	name = username->vp_strvalue;
 
-	RDEBUG3("Comparing name \"%s\" and check value \"%s\"", name, check->vp_strvalue);
+	RDEBUG3("Comparing name \"%s\" and check value \"%pV\"", name, &check->data);
 
 	len = strlen(check->vp_strvalue);
 
diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index efeb3a5aacc..11e9b931e38 100644
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -1434,7 +1434,7 @@ int tls_session_handshake(REQUEST *request, tls_session_t *session)
 			fr_pair_value_strcpy(vp,  SSL_CIPHER_get_name(cipher));
 			fr_pair_add(&request->state, vp);
 			RINDENT();
-			RDEBUG2("&session-state:TLS-Session-Cipher-Suite := \"%s\"", vp->vp_strvalue);
+			RDEBUG2("&session-state:%pP", vp);
 			REXDENT();
 		}
 
@@ -1762,7 +1762,7 @@ tls_session_t *tls_session_init_server(TALLOC_CTX *ctx, fr_tls_conf_t *conf, REQ
 	 */
 	vp = fr_pair_find_by_da(request->control, attr_tls_session_cert_file, TAG_ANY);
 	if (vp) {
-		RDEBUG2("Loading TLS session certificate \"%s\"", vp->vp_strvalue);
+		RDEBUG2("Loading TLS session certificate \"%pV\"", &vp->data);
 
 		if (SSL_use_certificate_file(session->ssl, vp->vp_strvalue, SSL_FILETYPE_PEM) != 1) {
 			tls_log_error(request, "Failed loading TLS session certificate \"%s\"",
diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index b0daadffb8e..a6c6422750f 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -377,7 +377,7 @@ static rlm_rcode_t mschap_finalize(REQUEST *request, rlm_eap_mschapv2_t *inst,
 
 			VP_VERIFY(response);
 
-			RDEBUG2("MSCHAP-Error: %s", response->vp_strvalue);
+			RDEBUG2("MSCHAP-Error: %pV", &response->data);
 
 			/*
 			 *	Parse the new challenge out of the
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index e2359314a3a..3d3cd132216 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -722,7 +722,7 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, tls_s
 
 			fr_pair_value_bstrncpy(t->username, data + 1, data_len - 1);
 
-			RDEBUG2("Got tunneled identity of %s", t->username->vp_strvalue);
+			RDEBUG2("Got tunneled identity of %pV", &t->username->data);
 		}
 	} /* else there WAS a t->username */
 
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 3fe0a248cd4..08513eec652 100644
--- 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
@@ -151,7 +151,7 @@ static rlm_rcode_t eap_tls_virtual_server(rlm_eap_tls_t *inst, REQUEST *request,
 	if (vp) {
 		server_cs = virtual_server_find(vp->vp_strvalue);
 		if (!server_cs) {
-			REDEBUG2("Virtual server \"%s\" not found", vp->vp_strvalue);
+			REDEBUG2("Virtual server \"%pV\" not found", &vp->data);
 		error:
 			eap_tls_fail(request, eap_session);
 			return RLM_MODULE_INVALID;
diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c
index e88ef8795e8..0a3168b65f4 100644
--- a/src/modules/rlm_example/rlm_example.c
+++ b/src/modules/rlm_example/rlm_example.c
@@ -79,7 +79,7 @@ static int rlm_example_cmp(UNUSED void *instance, REQUEST *request, UNUSED VALUE
 {
 	rad_assert(check->vp_type == FR_TYPE_STRING);
 
-	RINFO("Example-Paircmp called with \"%s\"", check->vp_strvalue);
+	RINFO("Example-Paircmp called with \"%pV\"", &check->data);
 
 	if (strcmp(check->vp_strvalue, "yes") == 0) return 0;
 	return 1;
diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index bc8bfbd5521..e8649d19701 100644
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -799,8 +799,8 @@ rlm_rcode_t rlm_ldap_check_userobj_dynamic(rlm_ldap_t const *inst, REQUEST *requ
 			    (memcmp(check->vp_strvalue, resolved, check->vp_length) == 0)) eq = true;
 			talloc_free(resolved);
 			if (eq) {
-				RDEBUG2("User found in group \"%s\". Comparison between membership: name "
-				       "(resolved from DN \"%s\"), check: name", check->vp_strvalue, value);
+				RDEBUG2("User found in group \"%pV\". Comparison between membership: name "
+				       "(resolved from DN \"%s\"), check: name", &check->data, value);
 				rcode = RLM_MODULE_OK;
 
 				goto finish;
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 1f7bac89dff..b5631dfd727 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1030,7 +1030,7 @@ static rlm_rcode_t mod_authorize(void *instance, UNUSED void *thread, REQUEST *r
 		fr_pair_value_bstrncpy(vp, password, pass_size);
 
 		if (RDEBUG_ENABLED3) {
-			RDEBUG3("Added eDirectory password.  control:%s += '%s'", vp->da->name, vp->vp_strvalue);
+			RDEBUG3("Added eDirectory password.  control:%pP", vp);
 		} else {
 			RDEBUG2("Added eDirectory password");
 		}
diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c
index a4cff1944e4..f7ea3d3ea11 100644
--- a/src/modules/rlm_logintime/rlm_logintime.c
+++ b/src/modules/rlm_logintime/rlm_logintime.c
@@ -104,7 +104,7 @@ static int time_of_day(UNUSED void *instance, REQUEST *request,
 	time_t		now;
 
 	if (strspn(check->vp_strvalue, "0123456789: ") != strlen(check->vp_strvalue)) {
-		RDEBUG2("Bad Time-Of-Day value \"%s\"", check->vp_strvalue);
+		RDEBUG2("Bad Time-Of-Day value \"%pV\"", &check->data);
 		return -1;
 	}
 
@@ -119,7 +119,7 @@ static int time_of_day(UNUSED void *instance, REQUEST *request,
 	scan = atoi(p);
 	p = strchr(p, ':');
 	if ((scan > 23) || !p) {
-		RDEBUG2("Bad Time-Of-Day value \"%s\"", check->vp_strvalue);
+		RDEBUG2("Bad Time-Of-Day value \"%pV\"", &check->data);
 		return -1;
 	}
 	when = scan * 3600;
@@ -127,7 +127,7 @@ static int time_of_day(UNUSED void *instance, REQUEST *request,
 
 	scan = atoi(p);
 	if (scan > 59) {
-		RDEBUG2("Bad Time-Of-Day value \"%s\"", check->vp_strvalue);
+		RDEBUG2("Bad Time-Of-Day value \"%pV\"", &check->data);
 		return -1;
 	}
 	when += scan * 60;
@@ -136,7 +136,7 @@ static int time_of_day(UNUSED void *instance, REQUEST *request,
 	if (p) {
 		scan = atoi(p + 1);
 		if (scan > 59) {
-			RDEBUG2("Bad Time-Of-Day value \"%s\"", check->vp_strvalue);
+			RDEBUG2("Bad Time-Of-Day value \"%pV\"", &check->data);
 			return -1;
 		}
 		when += scan;
diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 2ac2f35c051..528ebc66100 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -1925,7 +1925,7 @@ int rest_request_config(rlm_rest_t const *inst, rlm_rest_thread_t *t, rlm_rest_s
 			continue;
 		}
 		RINDENT();
-		RDEBUG3("%s", header->vp_strvalue);
+		RDEBUG3("%pV", &header->data);
 		REXDENT();
 
 		ctx->headers = curl_slist_append(ctx->headers, header->vp_strvalue);
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 9a2bc588d46..ecea7f38e57 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -656,7 +656,7 @@ int sql_set_user(rlm_sql_t const *inst, REQUEST *request, char const *username)
 	 */
 	MEM(pair_update_request(&vp, inst->sql_user) >= 0);
 	fr_pair_value_strsteal(vp, expanded);
-	RDEBUG2("SQL-User-Name set to '%s'", vp->vp_strvalue);
+	RDEBUG2("SQL-User-Name set to '%pV'", &vp->data);
 
 	return 0;
 }
diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 13107a32668..0da4a204b6b 100644
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -181,7 +181,7 @@ static int rlm_test_cmp(UNUSED void *instance, REQUEST *request, UNUSED VALUE_PA
 {
 	rad_assert(check->vp_type == FR_TYPE_STRING);
 
-	RINFO("Test-Paircmp called with \"%s\"", check->vp_strvalue);
+	RINFO("Test-Paircmp called with \"%pV\"", &check->data);
 
 	if (strcmp(check->vp_strvalue, "yes") == 0) return 0;
 	return 1;
diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 059238687ea..3548888a8fc 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -144,7 +144,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(UNUSED void *instance, UNUSED
 		p[(5*3)+2] = '\0';
 		fr_pair_value_strsteal(vp, p);
 
-		DEBUG2("Fixing WiMAX binary Calling-Station-Id to %s", vp->vp_strvalue);
+		DEBUG2("Fixing WiMAX binary Calling-Station-Id to %pV", &vp->data);
 		return RLM_MODULE_OK;
 	}
 
diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c
index eaf54e9144f..46040a76ced 100644
--- a/src/modules/rlm_winbind/rlm_winbind.c
+++ b/src/modules/rlm_winbind/rlm_winbind.c
@@ -171,7 +171,7 @@ static int winbind_group_cmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR
 		goto error;
 	}
 
-	REDEBUG2("Trying to find user \"%s\" in group \"%s\"", username, check->vp_strvalue);
+	REDEBUG2("Trying to find user \"%s\" in group \"%pV\"", username, &check->data);
 
 	err = wbcCtxGetGroups(wb_ctx, username, &num_groups, &wb_groups);
 	switch (err) {
diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index 90f09f091c8..91b728e89d3 100644
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -316,11 +316,11 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
 
 		RINDENT();
 		if (RDEBUG_ENABLED3) {
-			RDEBUG3("&request:Yubikey-OTP := '%s'", vp->vp_strvalue);
-			RDEBUG3("&request:User-Password := '%s'", password->vp_strvalue);
+			RDEBUG3("&request:%pP", vp);
+			RDEBUG3("&request:%pP", password);
 		} else {
-			RDEBUG2("&request:Yubikey-OTP := <<< secret >>>");
-			RDEBUG2("&request:User-Password := <<< secret >>>");
+			RDEBUG2("&request:%s := <<< secret >>>", vp->da->name);
+			RDEBUG2("&request:%s := <<< secret >>>", password->da->name);
 		}
 		REXDENT();