vserver 2.0 rc7

[linux-2.6.git] / fs / lockd / host.c

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 54f25ae..52707c5 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -110,7 +110,6 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
        host->h_addr.sin_port = 0;      /* ouch! */
        host->h_version    = version;
        host->h_proto      = proto;
-       host->h_authflavor = RPC_AUTH_UNIX;
        host->h_rpcclnt    = NULL;
        init_MUTEX(&host->h_sema);
        host->h_nextrebind = jiffies + NLM_HOST_REBIND;
@@ -191,8 +190,9 @@ nlm_bind_host(struct nlm_host *host)
 
                xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
 
+               /* Existing NLM servers accept AUTH_UNIX only */
                clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
-                                       host->h_version, host->h_authflavor);
+                                       host->h_version, RPC_AUTH_UNIX);
                if (IS_ERR(clnt)) {
                        xprt_destroy(xprt);
                        goto forgetit;