64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From 510ab52ed43589d96f0fab338eb6286940a29a78 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Thu, 3 Jan 2019 12:00:58 +0100
|
|
Subject: [PATCH] libtest/stub_gssapi: use "real" snprintf
|
|
|
|
... since it doesn't link with libcurl.
|
|
|
|
Reverts the commit dcd6f81025 changes from this file.
|
|
|
|
Bug: https://curl.haxx.se/mail/lib-2019-01/0000.html
|
|
Reported-by: Shlomi Fish
|
|
Reviewed-by: Daniel Gustafsson
|
|
Reviewed-by: Kamil Dudka
|
|
|
|
Closes #3434
|
|
|
|
Upstream-commit: c7c362a24c0247644f9fde05e8ea353af4a94b04
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
tests/libtest/stub_gssapi.c | 13 ++++++-------
|
|
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tests/libtest/stub_gssapi.c b/tests/libtest/stub_gssapi.c
|
|
index 254a01b31..377b75452 100644
|
|
--- a/tests/libtest/stub_gssapi.c
|
|
+++ b/tests/libtest/stub_gssapi.c
|
|
@@ -5,7 +5,7 @@
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
- * Copyright (C) 2017-2018, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
+ * Copyright (C) 2017-2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
@@ -28,10 +28,7 @@
|
|
|
|
#include "stub_gssapi.h"
|
|
|
|
-#define ENABLE_CURLX_PRINTF
|
|
-/* make the curlx header define all printf() functions to use the curlx_*
|
|
- versions instead */
|
|
-#include "curlx.h" /* from the private lib dir */
|
|
+/* !checksrc! disable SNPRINTF all */
|
|
|
|
#define MAX_CREDS_LENGTH 250
|
|
#define APPROX_TOKEN_LEN 250
|
|
@@ -207,8 +204,10 @@ OM_uint32 gss_init_sec_context(OM_uint32 *min,
|
|
}
|
|
|
|
/* Token format: creds:target:type:padding */
|
|
- used = msnprintf(token, length, "%s:%s:%d:", creds,
|
|
- (char *) target_name, ctx->sent);
|
|
+ /* Note: this is using the *real* snprintf() and not the curl provided
|
|
+ one */
|
|
+ used = snprintf(token, length, "%s:%s:%d:", creds,
|
|
+ (char *) target_name, ctx->sent);
|
|
|
|
if(used >= length) {
|
|
free(token);
|
|
--
|
|
2.17.2
|
|
|