All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Neil Brown <neilb@cse.unsw.edu.au>
Cc: nfs@lists.sourceforge.net, Trond Myklebust <trond.myklebust@fys.uio.no>
Subject: [PATCH 6 of 6] nfsd: remove pg_authenticate field
Date: Thu, 16 Sep 2004 19:16:44 -0400	[thread overview]
Message-ID: <1095375544.839c1c96.6@fieldses.org> (raw)
In-Reply-To: <1095375544.839c1c96.5@fieldses.org>


The pg_authenticate 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
pg_authenticate.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

 linux-2.6.9-rc2-bfields/include/linux/sunrpc/svc.h |    1 -
 linux-2.6.9-rc2-bfields/net/sunrpc/svc.c           |    5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff -puN net/sunrpc/svc.c~nfsd_remove_pg_authenticate net/sunrpc/svc.c
--- linux-2.6.9-rc2/net/sunrpc/svc.c~nfsd_remove_pg_authenticate	2004-09-16 16:29:22.000000000 -0400
+++ linux-2.6.9-rc2-bfields/net/sunrpc/svc.c	2004-09-16 16:29:22.000000000 -0400
@@ -311,10 +311,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 != NULL)
-		auth_res = progp->pg_authenticate(rqstp, &auth_stat);
-	else
-		auth_res = svc_authenticate(rqstp, &auth_stat);
+	auth_res = svc_authenticate(rqstp, &auth_stat);
 	switch (auth_res) {
 	case SVC_OK:
 		break;
diff -puN include/linux/sunrpc/svc.h~nfsd_remove_pg_authenticate include/linux/sunrpc/svc.h
--- linux-2.6.9-rc2/include/linux/sunrpc/svc.h~nfsd_remove_pg_authenticate	2004-09-16 16:29:22.000000000 -0400
+++ linux-2.6.9-rc2-bfields/include/linux/sunrpc/svc.h	2004-09-16 16:29:22.000000000 -0400
@@ -252,7 +252,6 @@ struct svc_program {
 	char *			pg_class;	/* class name: services sharing authentication */
 	struct svc_stat *	pg_stats;	/* rpc statistics */
 	/* Override authentication. NULL means use default */
-	int			(*pg_authenticate)(struct svc_rqst *, u32 *);
 	int			(*pg_set_client)(struct svc_rqst *);
 };
 
_


-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

  reply	other threads:[~2004-09-16 23:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20040916230555.GA13415@fieldses.org>
2004-09-16 23:07 ` 6 svcauth_unix patches to make export table lookups optional J. Bruce Fields
2004-09-16 23:16   ` [PATCH 1 of 6] svcrpc: auth_null fixes J. Bruce Fields
2004-09-16 23:16     ` [PATCH 2 of 6] svcrpc: share code duplicated between auth_unix and auth_null J. Bruce Fields
2004-09-16 23:16       ` [PATCH 3 of 6] svcrpc: move export table checks to a per-program pg_add_client method J. Bruce Fields
2004-09-16 23:16         ` [PATCH 4 of 6] nfs4: use new pg_set_client method to simplify nfs4 callback authentication J. Bruce Fields
2004-09-16 23:16           ` [PATCH 5 of 6] lockd: don't try to match callback requests against export table J. Bruce Fields
2004-09-16 23:16             ` J. Bruce Fields [this message]
2004-09-16 23:34             ` Trond Myklebust
2004-09-24  3:55               ` Neil Brown
2004-09-16 23:38         ` [PATCH 3 of 6] svcrpc: move export table checks to a per-program pg_add_client method Trond Myklebust
2004-09-17  1:11           ` J. Bruce Fields
2004-09-17  1:18         ` Trond Myklebust
2004-09-17  2:20           ` J. Bruce Fields
2004-09-22  6:54             ` Neil Brown
2004-09-22 10:10               ` Olaf Kirch
2004-09-23 21:46               ` J. Bruce Fields
2004-09-24  4:04                 ` Neil Brown
2004-09-24  7:42                   ` Olaf Kirch
2004-09-24 20:58                     ` J. Bruce Fields
2004-09-28 22:00                   ` J. Bruce Fields
2004-09-28 22:11                     ` Trond Myklebust
2004-09-28 22:37                       ` Trond Myklebust
2004-12-09 22:28 [PATCH 5 of 6] lockd: don't try to match callback requests against export table J. Bruce Fields
2004-12-09 22:28 ` [PATCH 6 of 6] nfsd: remove pg_authenticate field J. Bruce Fields
  -- strict thread matches above, loose matches on Subject: below --
2005-01-18 18:06 [PATCH 5 of 6] lockd: don't try to match callback requests against export table J. Bruce Fields
2005-01-18 18:06 ` [PATCH 6 of 6] nfsd: remove pg_authenticate field J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1095375544.839c1c96.6@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=neilb@cse.unsw.edu.au \
    --cc=nfs@lists.sourceforge.net \
    --cc=trond.myklebust@fys.uio.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.