From 7762d249b6cb345787d747c19192a146e9b7c0b4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 21 Dec 2010 21:41:02 +1100 Subject: [PATCH] gsstest: fixed compilation errors gsstest was not being compiled with GSSAPI due to a Makefile.in error. Once fixed, this revealed two other errors --- bin/tests/dst/Makefile.in | 2 +- bin/tests/dst/gsstest.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in index 7eb069e..73fcf66 100644 --- a/bin/tests/dst/Makefile.in +++ b/bin/tests/dst/Makefile.in @@ -24,7 +24,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} \ ${ISC_INCLUDES} @DST_GSSAPI_INC@ -CDEFINES = +CDEFINES = @USE_GSSAPI@ CWARNINGS = DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ diff --git a/bin/tests/dst/gsstest.c b/bin/tests/dst/gsstest.c index c360584..3765d82 100755 --- a/bin/tests/dst/gsstest.c +++ b/bin/tests/dst/gsstest.c @@ -359,7 +359,7 @@ initctx1(isc_task_t *task, isc_event_t *event) { printf("Initctx - context name we're using: %s\n", contextname); printf("Negotiating GSSAPI context: "); - printf(gssid); + printf("%s", gssid); printf("\n"); /* @@ -388,7 +388,8 @@ initctx1(isc_task_t *task, isc_event_t *event) { gssctx = GSS_C_NO_CONTEXT; result = dns_tkey_buildgssquery(query, dns_fixedname_name(&servername), dns_fixedname_name(&gssname), - NULL, 36000, &gssctx, ISC_TRUE); + NULL, 36000, &gssctx, ISC_TRUE, + NULL, mctx, NULL); CHECK("dns_tkey_buildgssquery", result); printf("Sending context token to server\n"); -- 2.34.1