vserver 2.0 rc7

[linux-2.6.git] / include / linux / sunrpc / gss_api.h

diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index 629957d..689262f 100644 (file)
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -33,8 +33,9 @@ struct gss_ctx {
 
 /* gss-api prototypes; note that these are somewhat simplified versions of
  * the prototypes specified in RFC 2744. */
-u32 gss_import_sec_context(
-               struct xdr_netobj       *input_token,
+int gss_import_sec_context(
+               const void*             input_token,
+               size_t                  bufsize,
                struct gss_api_mech     *mech,
                struct gss_ctx          **ctx_id);
 u32 gss_get_mic(
@@ -50,8 +51,6 @@ u32 gss_verify_mic(
 u32 gss_delete_sec_context(
                struct gss_ctx          **ctx_id);
 
-struct gss_api_mech * gss_mech_get_by_name(char *name);
-struct gss_api_mech * gss_mech_get_by_pseudoflavor(u32 pseudoflavor);
 u32 gss_pseudoflavor_to_service(struct gss_api_mech *, u32 pseudoflavor);
 char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);
 
@@ -80,8 +79,9 @@ struct gss_api_mech {
 
 /* and must provide the following operations: */
 struct gss_api_ops {
-       u32 (*gss_import_sec_context)(
-                       struct xdr_netobj       *input_token,
+       int (*gss_import_sec_context)(
+                       const void              *input_token,
+                       size_t                  bufsize,
                        struct gss_ctx          *ctx_id);
        u32 (*gss_get_mic)(
                        struct gss_ctx          *ctx_id,
@@ -105,7 +105,7 @@ void gss_mech_unregister(struct gss_api_mech *);
 struct gss_api_mech * gss_mech_get_by_OID(struct xdr_netobj *);
 
 /* Returns a reference to a mechanism, given a name like "krb5" etc. */
-struct gss_api_mech *gss_mech_get_by_name(char *);
+struct gss_api_mech *gss_mech_get_by_name(const char *);
 
 /* Similar, but get by pseudoflavor. */
 struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);