[exim-cvs] Minor cleanups.

Gitweb: http://git.exim.org/exim.git/commitdiff/b245b4a5b28e1011655ce3b6ac5051ba6c517299

Commit:     b245b4a5b28e1011655ce3b6ac5051ba6c517299
Parent:     f35771fe04c823641775bbaa17df2186057cd86d
Author:     Phil Pennock <pdp@???>
AuthorDate: Sat Feb 18 04:10:35 2012 -0500
Committer:  Phil Pennock <pdp@???>
CommitDate: Sat Feb 18 04:10:35 2012 -0500

    Minor cleanups.

    multi-blank-line protection never set the bool needed
    OID-method for keytab setting cleanup (drop <roken.h> and fix comments)
---
 src/src/auths/heimdal_gssapi.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c
index 29d148b..5f3b7ec 100644
--- a/src/src/auths/heimdal_gssapi.c
+++ b/src/src/auths/heimdal_gssapi.c
@@ -9,7 +9,7 @@
    Author: Phil Pennock <pdp@???> */
 /* Copyright (c) Phil Pennock 2012 */

-/* Interface to Heimdal SASL library for GSSAPI authentication. */
+/* Interface to Heimdal library for GSSAPI authentication. */

/* Naming and rationale

@@ -34,8 +34,9 @@ Without rename, we could add an option for GS2 support in the future.
* heimdal sources and man-pages, plus http://www.h5l.org/manual/
* FreeBSD man-pages (very informative!)
* http://www.ggf.org/documents/GFD.24.pdf confirming GSS_KRB5_REGISTER_ACCEPTOR_IDENTITY_X
- semantics, that found by browsing Heimdal source to find how to set the keytab
-
+ semantics, that found by browsing Heimdal source to find how to set the keytab; however,
+ after multiple attempts I failed to get that to work and instead switched to
+ gsskrb5_register_acceptor_identity().
*/

#include "../exim.h"
@@ -51,9 +52,6 @@ static void dummy(int x) { dummy(x-1); }
/* for the _init debugging */
#include <krb5.h>

-/* Because __gss_krb5_register_acceptor_identity_x_oid_desc is internal */
-#include <roken.h>
-
#include "heimdal_gssapi.h"

/* Authenticator-specific options. */
@@ -99,8 +97,8 @@ static int
enable consistency checks to be done, or anything else that needs
to be set up. */

-/* Heimdal provides a GSSAPI extension method (via an OID) for setting the
-keytab; in the init, we mostly just use raw krb5 methods so that we can report
+/* Heimdal provides a GSSAPI extension method for setting the keytab;
+in the init, we mostly just use raw krb5 methods so that we can report
the keytab contents, for -D+auth debugging. */

 void
@@ -313,6 +311,7 @@ auth_heimdal_gssapi_server(auth_instance *ablock, uschar *initial_data)
             error_out = auth_get_data(&from_client, US"", 0);
             if (error_out != OK)
               goto ERROR_OUT;
+            handled_empty_ir = TRUE;
             continue;
           }
         }
@@ -369,7 +368,7 @@ auth_heimdal_gssapi_server(auth_instance *ablock, uschar *initial_data)
         0x02 Integrity protection
         0x04 Confidentiality protection

-        The remaining three octets are the maximum buffer size for wrappe
+        The remaining three octets are the maximum buffer size for wrapped
         content. */
         sasl_config[0] = 0x01;  /* Exim does not wrap/unwrap SASL layers after auth */
         gbufdesc.value = (void *) sasl_config;