SUNRPC: Clean up: Remove unused XDR decoder functions from rpcb_clnt.c

[safe/jmp/linux-2.6] / net / sunrpc / auth_generic.c

diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 6f129b1..4028502 100644 (file)
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -17,6 +17,9 @@
 # define RPCDBG_FACILITY       RPCDBG_AUTH
 #endif
 
+#define RPC_MACHINE_CRED_USERID                ((uid_t)0)
+#define RPC_MACHINE_CRED_GROUPID       ((gid_t)0)
+
 struct generic_cred {
        struct rpc_cred gc_base;
        struct auth_cred acred;
@@ -36,6 +39,36 @@ struct rpc_cred *rpc_lookup_cred(void)
 EXPORT_SYMBOL_GPL(rpc_lookup_cred);
 
 /*
+ * Public call interface for looking up machine creds.
+ */
+struct rpc_cred *rpc_lookup_machine_cred(void)
+{
+       struct auth_cred acred = {
+               .uid = RPC_MACHINE_CRED_USERID,
+               .gid = RPC_MACHINE_CRED_GROUPID,
+               .machine_cred = 1,
+       };
+
+       dprintk("RPC:       looking up machine cred\n");
+       return generic_auth.au_ops->lookup_cred(&generic_auth, &acred, 0);
+}
+EXPORT_SYMBOL_GPL(rpc_lookup_machine_cred);
+
+static void
+generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred)
+{
+       struct rpc_auth *auth = task->tk_client->cl_auth;
+       struct auth_cred *acred = &container_of(cred, struct generic_cred, gc_base)->acred;
+       struct rpc_cred *ret;
+
+       ret = auth->au_ops->lookup_cred(auth, acred, 0);
+       if (!IS_ERR(ret))
+               task->tk_msg.rpc_cred = ret;
+       else
+               task->tk_status = PTR_ERR(ret);
+}
+
+/*
  * Lookup generic creds for current process
  */
 static struct rpc_cred *
@@ -61,8 +94,10 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
        gcred->acred.group_info = acred->group_info;
        if (gcred->acred.group_info != NULL)
                get_group_info(gcred->acred.group_info);
+       gcred->acred.machine_cred = acred->machine_cred;
 
-       dprintk("RPC:       allocated generic cred %p for uid %d gid %d\n",
+       dprintk("RPC:       allocated %s cred %p for uid %d gid %d\n",
+                       gcred->acred.machine_cred ? "machine" : "generic",
                        gcred, acred->uid, acred->gid);
        return &gcred->gc_base;
 }
@@ -98,12 +133,29 @@ static int
 generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
 {
        struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);
+       int i;
 
        if (gcred->acred.uid != acred->uid ||
            gcred->acred.gid != acred->gid ||
-           gcred->acred.group_info != acred->group_info)
-               return 0;
+           gcred->acred.machine_cred != acred->machine_cred)
+               goto out_nomatch;
+
+       /* Optimisation in the case where pointers are identical... */
+       if (gcred->acred.group_info == acred->group_info)
+               goto out_match;
+
+       /* Slow path... */
+       if (gcred->acred.group_info->ngroups != acred->group_info->ngroups)
+               goto out_nomatch;
+       for (i = 0; i < gcred->acred.group_info->ngroups; i++) {
+               if (GROUP_AT(gcred->acred.group_info, i) !=
+                               GROUP_AT(acred->group_info, i))
+                       goto out_nomatch;
+       }
+out_match:
        return 1;
+out_nomatch:
+       return 0;
 }
 
 void __init rpc_init_generic_auth(void)
@@ -122,9 +174,7 @@ static struct rpc_cred_cache generic_cred_cache = {
 
 static const struct rpc_authops generic_auth_ops = {
        .owner = THIS_MODULE,
-#ifdef RPC_DEBUG
        .au_name = "Generic",
-#endif
        .lookup_cred = generic_lookup_cred,
        .crcreate = generic_create_cred,
 };
@@ -138,5 +188,6 @@ static struct rpc_auth generic_auth = {
 static const struct rpc_credops generic_credops = {
        .cr_name = "Generic cred",
        .crdestroy = generic_destroy_cred,
+       .crbind = generic_bind_cred,
        .crmatch = generic_match,
 };