summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2018-02-07 23:15:37 -0500
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2018-02-08 12:03:02 +0100
commit00cddd57ad37a7eb9543c3ea3d34714c7425f720 (patch)
tree3f69b741dadf07a3025d0bfd90819c8994e7a1f7
parent1d602879523c878458f81b9d9d00df49fdcea9ef (diff)
downloadexim4-00cddd57ad37a7eb9543c3ea3d34714c7425f720.tar.gz
Repair Heimdal GSSAPI authenticator init part 2exim-4.90.0.27
Broken-by: d185889f4 (cherry picked from commit aab9a84358906493bde0efc6aa13b00e59096396)
-rw-r--r--doc/doc-txt/ChangeLog3
-rw-r--r--src/src/auths/heimdal_gssapi.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ec4cae6d8..6e71f1fbb 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -61,8 +61,9 @@ JH/14 Bug 2174: A timeout on connect for a callout was also erroneously seen as
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) {}