diff options
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 3 | ||||
| -rw-r--r-- | src/src/auths/heimdal_gssapi.c | 3 | ||||
| -rw-r--r-- | src/src/auths/heimdal_gssapi.h | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 9b59f0578..e8ac8f360 100644 --- 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 5f3b7ecb4..9021509dd 100644 --- 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 b9e8a4ebb..a606a5c26 100644 --- 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; |