From: Phil Pennock <pdp@exim.org>
Date: Thu, 8 Feb 2018 04:15:37 +0000 (-0500)
Subject: Repair Heimdal GSSAPI authenticator init part 2
X-Git-Tag: exim-4_91_RC1~70
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aab9a84358906493bde0efc6aa13b00e59096396;p=exim.git

Repair Heimdal GSSAPI authenticator init part 2

Broken-by: d185889f4
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index e0981f4eb..8112d4b07 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -85,8 +85,9 @@ JH/15 Relax results from ACL control request to enable cutthrough, in
 JH/16 Fix bug in DKIM verify: a buffer overflow could corrupt the malloc
       metadata, resulting in a crash in free().
 
-PP/01 Fix broken refactor of Heimdal GSSAPI authenticator init.
+PP/01 Fix broken Heimdal GSSAPI authenticator integration.
       Broken in f2ed27cf5, missing an equals sign for specified-initialisers.
+      Broken also in d185889f4, with init system revamp.
 
 
 Exim version 4.90
diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c
index b583a73fd..631b9790c 100644
--- a/src/src/auths/heimdal_gssapi.c
+++ b/src/src/auths/heimdal_gssapi.c
@@ -80,9 +80,9 @@ auth_heimdal_gssapi_options_block auth_heimdal_gssapi_option_defaults = {
 #ifdef MACRO_PREDEF
 
 /* Dummy values */
-void auth_heimdal_init(auth_instance *ablock) {}
-int auth_heimdal_server(auth_instance *ablock, uschar *data) {return 0;}
-int auth_heimdal_client(auth_instance *ablock, smtp_inblock *inblock,
+void auth_heimdal_gssapi_init(auth_instance *ablock) {}
+int auth_heimdal_gssapi_server(auth_instance *ablock, uschar *data) {return 0;}
+int auth_heimdal_gssapi_client(auth_instance *ablock, smtp_inblock *inblock,
   smtp_outblock *outblock, int timeout, uschar *buffer, int buffsize) {return 0;}
 void auth_heimdal_gssapi_version_report(FILE *f) {}