gssd: include gssapi/gssapi.h before write_bytes.h

In gssd/context_lucid.c, ensure that gss_buffer_desc and gss_OID_desc
are defined before write_bytes.h, which uses these definitions, is
included.  With TI-RPC, these definitions are not provided by
rpc/rpc.h.

It appears that <gssapi/gssapi_krb5.h> already includes krb5.h and
gssapi.h (on my system, anyway) so let's drop those includes.

Ideally write_bytes.h itself should include the needed headers, but
some source files that use Heimdal include a different, Heimdal-
compatible, header to get these definitions.

Pointed-out-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/gssd/context_lucid.c b/utils/gssd/context_lucid.c
index 3243d53022444f97e032a28b936700b2a84968b1..af7de589160448d028bfd6783dd86660ac785f93 100644 (file)
--- a/utils/gssd/context_lucid.c
+++ b/utils/gssd/context_lucid.c
@@ -42,17 +42,17 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>

+
+#include <gssapi/gssapi_krb5.h>
+

 #include "gss_util.h"
 #include "gss_oids.h"
 #include "err_util.h"
 #include "context.h"
 
 #include "gss_util.h"
 #include "gss_oids.h"
 #include "err_util.h"
 #include "context.h"
 

-#include <krb5.h>
-#include <gssapi/gssapi.h>

 #ifndef OM_uint64
 typedef uint64_t OM_uint64;
 #endif
 #ifndef OM_uint64
 typedef uint64_t OM_uint64;
 #endif

-#include <gssapi/gssapi_krb5.h>

 
 static int
 write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)
 
 static int
 write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)