From: Chuck Lever Date: Thu, 5 Mar 2009 11:23:25 +0000 (-0500) Subject: gssd: include gssapi/gssapi.h before write_bytes.h X-Git-Tag: nfs-utils-1-1-5~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d201426838f6cd02e52e7e841901fa92a20e74f1;p=nfs-utils.git 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 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 Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- diff --git a/utils/gssd/context_lucid.c b/utils/gssd/context_lucid.c index 3243d53..af7de58 100644 --- a/utils/gssd/context_lucid.c +++ b/utils/gssd/context_lucid.c @@ -42,17 +42,17 @@ #include #include #include + +#include + #include "gss_util.h" #include "gss_oids.h" #include "err_util.h" #include "context.h" -#include -#include #ifndef OM_uint64 typedef uint64_t OM_uint64; #endif -#include static int write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)