auth_null used when auth_none is appropriate

svc_auth.c uses a fake entry function for AUTH_NULL (AUTH_NONE) when the
use of the svc_auth_none is appropriate.

With the previous patches to make use of WRAP/UNWRAP svc_auth_none is
required.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/src/svc_auth.c b/src/svc_auth.c
index c6b3a0bd75f55497ba4d68ff17dc114207688822..e80d5f91177e6274710fb390657c3d3e38c6628d 100644 (file)
--- a/src/svc_auth.c
+++ b/src/svc_auth.c
@@ -98,8 +98,8 @@ _authenticate(rqst, msg)
        rqst->rq_xprt->xp_verf.oa_length = 0;
        cred_flavor = rqst->rq_cred.oa_flavor;
        switch (cred_flavor) {
-       case AUTH_NULL:
-               dummy = _svcauth_null(rqst, msg);
+       case AUTH_NONE:
+               dummy = _svcauth_none(rqst, msg);
                return (dummy);
        case AUTH_SYS:
                dummy = _svcauth_unix(rqst, msg);
@@ -132,15 +132,6 @@ _authenticate(rqst, msg)
        return (AUTH_REJECTEDCRED);
 }
 
-/*ARGSUSED*/
-enum auth_stat
-_svcauth_null(rqst, msg)
-       struct svc_req *rqst;
-       struct rpc_msg *msg;
-{
-       return (AUTH_OK);
-}
-
 /*
  *  Allow the rpc service to register new authentication types that it is
  *  prepared to handle.  When an authentication flavor is registered,

diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index 734e6b90ecfa63c1b850e249f789e90804784661..f669ae48d9318de9783fcb92f31584826032b2b4 100644 (file)
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -373,7 +373,7 @@ __END_DECLS
 __BEGIN_DECLS
 struct svc_req;
 struct rpc_msg;
-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
 enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
 __END_DECLS