X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Flockd%2Fhost.c;fp=fs%2Flockd%2Fhost.c;h=52707c5ad6ea7d7e56a2e90a69e0a9375504e203;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=54f25ae2ad64926d1b365c523afa7b018c6f1c65;hpb=e3f6fb6212a7102bdb56ba38fa1e98fe72950475;p=linux-2.6.git

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 54f25ae2a..52707c5ad 100644
--- 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;