[exim-cvs] Drop server_realm from heimdal_gssapi

Gitweb: http://git.exim.org/exim.git/commitdiff/304e34d8d41f861dca7952b6c27b9974047d749f

Commit:     304e34d8d41f861dca7952b6c27b9974047d749f
Parent:     9775396084feef071a7c565d6d9b42839ae6098e
Author:     Phil Pennock <pdp@???>
AuthorDate: Sat Feb 18 07:15:16 2012 -0500
Committer:  Phil Pennock <pdp@???>
CommitDate: Sat Feb 18 07:15:16 2012 -0500

    Drop server_realm from heimdal_gssapi
---
 doc/doc-docbook/spec.xfpt      |    3 ---
 src/src/auths/heimdal_gssapi.c |    3 ---
 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 9b59f05..e8ac8f3 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 5f3b7ec..9021509 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 b9e8a4e..a606a5c 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@???> */
+/* 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;