rpc: pass target name down to rpc level on callbacks

The rpc client needs to know the principal that the setclientid was done
as, so it can tell gssd who to authenticate to.

Signed-off-by: Olga Kornievskaia <aglo@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4895c341e46d..347f2a25abb6 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -197,6 +197,12 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
 
         clnt->cl_rtt = &clnt->cl_rtt_default;
         rpc_init_rtt(&clnt->cl_rtt_default, clnt->cl_timeout->to_initval);
+        clnt->cl_principal = NULL;
+        if (args->client_name) {
+                clnt->cl_principal = kstrdup(args->client_name, GFP_KERNEL);
+                if (!clnt->cl_principal)
+                        goto out_no_principal;
+        }
 
         kref_init(&clnt->cl_kref);
 
@@ -226,6 +232,8 @@ out_no_auth:
                 rpc_put_mount();
         }
 out_no_path:
+        kfree(clnt->cl_principal);
+out_no_principal:
         rpc_free_iostats(clnt->cl_metrics);
 out_no_stats:
         if (clnt->cl_server != clnt->cl_inline_name)
@@ -354,6 +362,11 @@ rpc_clone_client(struct rpc_clnt *clnt)
         new->cl_metrics = rpc_alloc_iostats(clnt);
         if (new->cl_metrics == NULL)
                 goto out_no_stats;
+        if (clnt->cl_principal) {
+                new->cl_principal = kstrdup(clnt->cl_principal, GFP_KERNEL);
+                if (new->cl_principal == NULL)
+                        goto out_no_principal;
+        }
         kref_init(&new->cl_kref);
         err = rpc_setup_pipedir(new, clnt->cl_program->pipe_dir_name);
         if (err != 0)
@@ -366,6 +379,8 @@ rpc_clone_client(struct rpc_clnt *clnt)
         rpciod_up();
         return new;
 out_no_path:
+        kfree(new->cl_principal);
+out_no_principal:
         rpc_free_iostats(new->cl_metrics);
 out_no_stats:
         kfree(new);
@@ -417,6 +432,7 @@ rpc_free_client(struct kref *kref)
 out_free:
         rpc_unregister_client(clnt);
         rpc_free_iostats(clnt->cl_metrics);
+        kfree(clnt->cl_principal);
         clnt->cl_metrics = NULL;
         xprt_put(clnt->cl_xprt);
         rpciod_down();