diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-04-29 22:03:30 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-30 00:23:34 +0400 |
| commit | b1df7637232927ac69ed1a32e9c6b768f635b7d4 (patch) | |
| tree | cf5fdd96cccb3a89f4e0dea895775eb7c428c533 /net/sunrpc/auth_gss/gss_rpc_upcall.h | |
| parent | dd30333cf5a2f9dfecda5c6f4523133f13847aae (diff) | |
| parent | 721ccfb79b6f74f4052de70236d24047e73682d4 (diff) | |
| download | linux-b1df7637232927ac69ed1a32e9c6b768f635b7d4.tar.xz | |
Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
Note conflict: Chuck's patches modified (and made static)
gss_mech_get_by_OID, which is still needed by gss-proxy patches.
The conflict resolution is a bit minimal; we may want some more cleanup.
Diffstat (limited to 'net/sunrpc/auth_gss/gss_rpc_upcall.h')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_rpc_upcall.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.h b/net/sunrpc/auth_gss/gss_rpc_upcall.h index 4c2caaa7e84e..1e542aded90a 100644 --- a/net/sunrpc/auth_gss/gss_rpc_upcall.h +++ b/net/sunrpc/auth_gss/gss_rpc_upcall.h @@ -21,6 +21,7 @@ #ifndef _GSS_RPC_UPCALL_H #define _GSS_RPC_UPCALL_H +#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/auth_gss.h> #include "gss_rpc_xdr.h" #include "../netns.h" @@ -30,7 +31,7 @@ struct gssp_upcall_data { struct gssp_in_token in_token; struct xdr_netobj out_handle; struct xdr_netobj out_token; - struct xdr_netobj mech_oid; + struct rpcsec_gss_oid mech_oid; struct svc_cred creds; int found_creds; int major_status; |