X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fauths%2Fheimdal_gssapi.c;h=a09d454131d9c66dc2bec1e928b772a5d6ae7a86;hb=d56e798eb66ac044ff22f0daa2185549f5d49632;hp=82eb6a3f4d9f235e1368f3baa40f9c39fc8280c5;hpb=870ce70e11912e8858ef4c071f2778b93a4b2ac9;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c
index 82eb6a3f4..a09d45413 100644
--- a/src/src/auths/heimdal_gssapi.c
+++ b/src/src/auths/heimdal_gssapi.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Copyright (c) Twitter Inc 2012
@@ -59,11 +60,11 @@ static void dummy(int x) { dummy2(x-1); }
 /* Authenticator-specific options. */
 optionlist auth_heimdal_gssapi_options[] = {
   { "server_hostname",      opt_stringptr,
-      (void *)(offsetof(auth_heimdal_gssapi_options_block, server_hostname)) },
+      OPT_OFF(auth_heimdal_gssapi_options_block, server_hostname) },
   { "server_keytab",        opt_stringptr,
-      (void *)(offsetof(auth_heimdal_gssapi_options_block, server_keytab)) },
+      OPT_OFF(auth_heimdal_gssapi_options_block, server_keytab) },
   { "server_service",       opt_stringptr,
-      (void *)(offsetof(auth_heimdal_gssapi_options_block, server_service)) }
+      OPT_OFF(auth_heimdal_gssapi_options_block, server_service) }
 };
 
 int auth_heimdal_gssapi_options_count =
@@ -321,8 +322,7 @@ while (step < 4)
 	  }
 
 	HDEBUG(D_auth) debug_printf("gssapi: missing initial response, nudging.\n");
-	error_out = auth_get_data(&from_client, US"", 0);
-	if (error_out != OK)
+	if ((error_out = auth_get_data(&from_client, US"", 0)) != OK)
 	  goto ERROR_OUT;
 	handled_empty_ir = TRUE;
 	continue;