[PATCH] Some tidyup of svc_authenticate

We encode that status in the return value.

Also, don't pass 'proc' parameter to ->accept, as it is
implicit in rqstp.

include/linux/sunrpc/svcauth.h

@@ -83,7 +83,7 @@ struct auth_domain {
 struct auth_ops {
 	char *	name;
 	int	flavour;
-	int	(*accept)(struct svc_rqst *rq, u32 *authp, int proc);
+	int	(*accept)(struct svc_rqst *rq, u32 *authp);
 	int	(*release)(struct svc_rqst *rq);
 	void	(*domain_release)(struct auth_domain *);
 };
@@ -99,7 +99,7 @@ extern struct auth_ops	*authtab[RPC_AUTH_MAXFLAVOR];
 #define	SVC_PENDING	8
 
 
-extern int	svc_authenticate(struct svc_rqst *rqstp, u32 *statp, u32 *authp, int proc);
+extern int	svc_authenticate(struct svc_rqst *rqstp, u32 *authp);
 extern int	svc_authorise(struct svc_rqst *rqstp);
 extern int	svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops);
 extern void	svc_auth_unregister(rpc_authflavor_t flavor);

net/sunrpc/svc.c

@@ -304,15 +304,20 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
 	 * We do this before anything else in order to get a decent
 	 * auth verifier.
 	 */
-	if (svc_authenticate(rqstp, &rpc_stat, &auth_stat, proc))
-		/* drop the request, it has probably been deferred */
-		goto dropit;
-
-	if (rpc_stat != rpc_success)
-		goto err_garbage;
-
-	if (auth_stat != rpc_auth_ok)
+	switch (svc_authenticate(rqstp, &auth_stat)) {
+	case SVC_OK:
+		break;
+	case SVC_GARBAGE:
+		rpc_stat = rpc_garbage_args;
+		goto err_bad;
+	case SVC_SYSERR:
+		rpc_stat = rpc_system_err;
+		goto err_bad;
+	case SVC_DENIED:
 		goto err_bad_auth;
+	case SVC_DROP:
+		goto dropit;
+	}
 		
 	progp = serv->sv_program;
 	if (prog != progp->pg_prog)
@@ -458,7 +463,9 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
 #ifdef RPC_PARANOIA
 	printk("svc: failed to decode args\n");
 #endif
+	rpc_stat = rpc_garbage_args;
+err_bad:
 	serv->sv_stats->rpcbadfmt++;
-	svc_putu32(resv, rpc_garbage_args);
+	svc_putu32(resv, rpc_stat);
 	goto sendit;
 }

net/sunrpc/svcauth.c

@@ -33,12 +33,11 @@ static struct auth_ops	*authtab[RPC_AUTH_MAXFLAVOR] = {
 };
 
 int
-svc_authenticate(struct svc_rqst *rqstp, u32 *statp, u32 *authp, int proc)
+svc_authenticate(struct svc_rqst *rqstp, u32 *authp)
 {
 	rpc_authflavor_t	flavor;
 	struct auth_ops		*aops;
 
-	*statp = rpc_success;
 	*authp = rpc_auth_ok;
 
 	flavor = ntohl(svc_getu32(&rqstp->rq_arg.head[0]));
@@ -46,25 +45,11 @@ svc_authenticate(struct svc_rqst *rqstp, u32 *statp, u32 *authp, int proc)
 	dprintk("svc: svc_authenticate (%d)\n", flavor);
 	if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor])) {
 		*authp = rpc_autherr_badcred;
-		return 0;
+		return SVC_DENIED;
 	}
 
 	rqstp->rq_authop = aops;
-	switch (aops->accept(rqstp, authp, proc)) {
-	case SVC_OK:
-		return 0;
-	case SVC_GARBAGE:
-		*statp = rpc_garbage_args;
-		return 0;
-	case SVC_SYSERR:
-		*statp = rpc_system_err;
-		return 0;
-	case SVC_DENIED:
-		return 0;
-	case SVC_DROP:
-		break;
-	}
-	return 1; /* drop the request */
+	return aops->accept(rqstp, authp);
 }
 
 /* A reqeust, which was authenticated, has now executed.

net/sunrpc/svcauth_unix.c

@@ -321,7 +321,7 @@ void svcauth_unix_purge(void)
 
 
 static int
-svcauth_null_accept(struct svc_rqst *rqstp, u32 *authp, int proc)
+svcauth_null_accept(struct svc_rqst *rqstp, u32 *authp)
 {
 	struct iovec	*argv = &rqstp->rq_arg.head[0];
 	struct iovec	*resv = &rqstp->rq_res.head[0];
@@ -376,7 +376,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, u32 *authp, int proc)
 		}
 	else rv = SVC_DROP;
 
-	if (rqstp->rq_client == NULL && proc != 0)
+	if (rqstp->rq_client == NULL && rqstp->rq_proc != 0)
 		*authp = rpc_autherr_badcred;
 
 	return rv;
@@ -402,7 +402,7 @@ struct auth_ops svcauth_null = {
 
 
 int
-svcauth_unix_accept(struct svc_rqst *rqstp, u32 *authp, int proc)
+svcauth_unix_accept(struct svc_rqst *rqstp, u32 *authp)
 {
 	struct iovec	*argv = &rqstp->rq_arg.head[0];
 	struct iovec	*resv = &rqstp->rq_res.head[0];
@@ -470,7 +470,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, u32 *authp, int proc)
 		}
 	else rv = SVC_DROP;
 
-	if (rqstp->rq_client == NULL && proc != 0)
+	if (rqstp->rq_client == NULL && rqstp->rq_proc != 0)
 		goto badcred;
 	return rv;