diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-03-05 06:23:25 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-03-05 06:23:25 -0500 |
| commit | d201426838f6cd02e52e7e841901fa92a20e74f1 (patch) | |
| tree | 824e53b32e74a6f43c96465223d1e06de92a410a | |
| parent | d78a45a152d2270b6e92b451b6b4585567ec2f8a (diff) | |
| download | nfs-utils-d201426838f6cd02e52e7e841901fa92a20e74f1.tar.gz nfs-utils-d201426838f6cd02e52e7e841901fa92a20e74f1.tar.xz nfs-utils-d201426838f6cd02e52e7e841901fa92a20e74f1.zip | |
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>
| -rw-r--r-- | utils/gssd/context_lucid.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 <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 <krb5.h> -#include <gssapi/gssapi.h> #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) |