gsstest: fixed compilation errors

gsstest was not being compiled with GSSAPI due to a Makefile.in
error. Once fixed, this revealed two other errors

diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 7eb069ec416276c4740ec91b8dda2828019e143c..73fcf666a82382359d3d1843c02bd0acac99c3b1 100644 (file)
--- 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 c36058422b92c7b1588ffdd6c8974d35973b5a99..3765d826fcd415cb6c8b7e5740272eb98688fb83 100755 (executable)
--- 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");