Drop server_realm from heimdal_gssapi

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 9b59f057825ff676c7b3ef58ab58f268ef26ca07..e8ac8f360c042059afdda08899f85654ed5729e4 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -24483,9 +24483,6 @@ If set, then Heimdal will not use the system default keytab (typically
 &_/etc/krb5.keytab_&) but instead the pathname given in this option.
 The value should be a pathname, with no &"file:"& prefix.
 
-.option server_realm heimdal_gssapi string&!! unset
-Er, unused.  XXXFIXMEXXX
-
 .option server_service heimdal_gssapi string&!! "smtp"
 This option specifies the service identifier used, in conjunction with
 &%server_hostname%&, for building the identifer for finding credentials

diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c
index 5f3b7ecb42f91ec0863f8934afd1da20a0af34e2..9021509dd9f6650249b2b358c000f1c02e693ab8 100644 (file)
--- a/src/src/auths/heimdal_gssapi.c
+++ b/src/src/auths/heimdal_gssapi.c
@@ -60,8 +60,6 @@ optionlist auth_heimdal_gssapi_options[] = {
       (void *)(offsetof(auth_heimdal_gssapi_options_block, server_hostname)) },
   { "server_keytab",        opt_stringptr,
       (void *)(offsetof(auth_heimdal_gssapi_options_block, server_keytab)) },
-  { "server_realm",         opt_stringptr,
-      (void *)(offsetof(auth_heimdal_gssapi_options_block, server_realm)) },
   { "server_service",       opt_stringptr,
       (void *)(offsetof(auth_heimdal_gssapi_options_block, server_service)) }
 };
@@ -73,7 +71,6 @@ int auth_heimdal_gssapi_options_count =
 auth_heimdal_gssapi_options_block auth_heimdal_gssapi_option_defaults = {
   US"$primary_hostname",    /* server_hostname */
   NULL,                     /* server_keytab */
-  NULL,                     /* server_realm */
   US"smtp",                 /* server_service */
 };
 

diff --git a/src/src/auths/heimdal_gssapi.h b/src/src/auths/heimdal_gssapi.h
index b9e8a4ebb62b04be9ff96e3450d89524da59a38d..a606a5c26cc0840eb8f59326705dd2992b7322c2 100644 (file)
--- a/src/src/auths/heimdal_gssapi.h
+++ b/src/src/auths/heimdal_gssapi.h
@@ -5,7 +5,9 @@
 /* Copyright (c) University of Cambridge 1995 - 2012 */
 /* See the file NOTICE for conditions of use and distribution. */
 
-/* Copyright (c) Twitter Inc 2012 */
+/* Copyright (c) Twitter Inc 2012
+   Author: Phil Pennock <pdp@exim.org> */
+/* Copyright (c) Phil Pennock 2012 */
 
 /* Interface to Heimdal library for GSSAPI authentication. */
 
@@ -14,7 +16,6 @@
 typedef struct {
   uschar *server_hostname;
   uschar *server_keytab;
-  uschar *server_realm;
   uschar *server_service;
 } auth_heimdal_gssapi_options_block;