From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: [PATCH 6 of 6] nfsd: remove pg_authenticate field Date: Thu, 09 Dec 2004 17:28:37 -0500 Message-ID: <1102628809.16c39937.6@fieldses.org> References: <1102628809.16c39937.5@fieldses.org> Cc: nfs@lists.sourceforge.net, Trond Myklebust Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list2.sourceforge.net with esmtp (Exim 4.30) id 1CcWlr-0005GN-FB for nfs@lists.sourceforge.net; Thu, 09 Dec 2004 14:28:23 -0800 Received: from dh173.citi.umich.edu ([141.211.133.173] helo=puzzle.fieldses.org ident=Debian-exim) by sc8-sf-mx1.sourceforge.net with esmtp (TLSv1:RC4-SHA:128) (Exim 4.41) id 1CcWlh-0006Q4-6u for nfs@lists.sourceforge.net; Thu, 09 Dec 2004 14:28:23 -0800 To: Neil Brown In-Reply-To: <1102628809.16c39937.5@fieldses.org> Sender: nfs-admin@lists.sourceforge.net Errors-To: nfs-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: Discussion of NFS under Linux development, interoperability, and testing. List-Post: List-Help: List-Subscribe: , List-Archive: The pg_authenticate (now pg_authenticate_obsolete) callback was only being used by the nfs4 client callback code to circumvent the svcauth_unix code's insistence on checking all requests against the export table. With that problem solved, we no longer need it. Signed-off-by: J. Bruce Fields --- linux-2.6.10-rc3-bfields/include/linux/sunrpc/svc.h | 2 -- linux-2.6.10-rc3-bfields/net/sunrpc/svc.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff -puN include/linux/sunrpc/svc.h~nfsd_remove_pg_authenticate include/linux/sunrpc/svc.h --- linux-2.6.10-rc3/include/linux/sunrpc/svc.h~nfsd_remove_pg_authenticate 2004-12-08 15:12:14.000000000 -0500 +++ linux-2.6.10-rc3-bfields/include/linux/sunrpc/svc.h 2004-12-08 15:12:14.000000000 -0500 @@ -251,8 +251,6 @@ struct svc_program { char * pg_name; /* service name */ char * pg_class; /* class name: services sharing authentication */ struct svc_stat * pg_stats; /* rpc statistics */ - /* Override authentication. NULL means use default */ - int (*pg_authenticate_obsolete)(struct svc_rqst *, u32 *); int (*pg_authenticate)(struct svc_rqst *); }; diff -puN net/sunrpc/svc.c~nfsd_remove_pg_authenticate net/sunrpc/svc.c --- linux-2.6.10-rc3/net/sunrpc/svc.c~nfsd_remove_pg_authenticate 2004-12-08 15:12:14.000000000 -0500 +++ linux-2.6.10-rc3-bfields/net/sunrpc/svc.c 2004-12-08 15:12:14.000000000 -0500 @@ -315,10 +315,7 @@ svc_process(struct svc_serv *serv, struc * We do this before anything else in order to get a decent * auth verifier. */ - if (progp->pg_authenticate_obsolete != NULL) - auth_res = progp->pg_authenticate_obsolete(rqstp, &auth_stat); - else - auth_res = svc_authenticate(rqstp, &auth_stat); + auth_res = svc_authenticate(rqstp, &auth_stat); /* Also give the program a chance to reject this call: */ if (auth_res == SVC_OK) { auth_stat = rpc_autherr_badcred; _ ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://productguide.itmanagersjournal.com/ _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs