Merge branch 'master' of /home/src/linux-2.6/

1 files changed, 6 insertions, 4 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index b68c11a2d6dd..be4772ed43c0 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -48,7 +48,7 @@ struct rpc_cred {
 
         /* per-flavor data */
 };
-#define RPCAUTH_CRED_LOCKED     0x0001
+#define RPCAUTH_CRED_NEW        0x0001
 #define RPCAUTH_CRED_UPTODATE   0x0002
 
 #define RPCAUTH_CRED_MAGIC      0x0f4aa4f0
@@ -83,9 +83,10 @@ struct rpc_auth {
         struct rpc_cred_cache * au_credcache;
         /* per-flavor data */
 };
-#define RPC_AUTH_PROC_CREDS     0x0010          /* process creds (including
-                                                 * uid/gid, fs[ug]id, gids)
-                                                 */
+
+/* Flags for rpcauth_lookupcred() */
+#define RPCAUTH_LOOKUP_NEW              0x01    /* Accept an uninitialised cred */
+#define RPCAUTH_LOOKUP_ROOTCREDS        0x02    /* This really ought to go! */
 
 /*
  * Client authentication ops
@@ -105,6 +106,7 @@ struct rpc_authops {
 
 struct rpc_credops {
         const char *            cr_name;        /* Name of the auth flavour */
+        int                     (*cr_init)(struct rpc_auth *, struct rpc_cred *);
         void                    (*crdestroy)(struct rpc_cred *);
 
         int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);