diff --git a/libtirpc/src/auth_none.c b/libtirpc/src/auth_none.c index 5bfa48a..1afad5e 100644 --- a/libtirpc/src/auth_none.c +++ b/libtirpc/src/auth_none.c @@ -156,8 +156,14 @@ authnone_destroy(AUTH *client) { } -static bool_t -authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) +static int +authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args) +{ + return ((*func)(xdrs, args)); +} + +static int +authnone_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) { return ((*func)(xdrs, args)); } @@ -178,7 +184,7 @@ authnone_ops() ops.ah_refresh = authnone_refresh; ops.ah_destroy = authnone_destroy; ops.ah_wrap = authnone_wrap; - ops.ah_unwrap = authnone_wrap; + ops.ah_unwrap = authnone_unwrap; } mutex_unlock(&ops_lock); return (&ops); diff --git a/libtirpc/src/auth_sspi.c b/libtirpc/src/auth_sspi.c index 2456c2e..7664809 100644 --- a/libtirpc/src/auth_sspi.c +++ b/libtirpc/src/auth_sspi.c @@ -40,7 +40,7 @@ static bool_t authsspi_validate(AUTH *auth, struct opaque_auth *verf, u_int seq) static void authsspi_destroy(AUTH *auth); static void authsspi_destroy_context(AUTH *auth); static bool_t authsspi_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr); -static bool_t authsspi_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr); +static bool_t authsspi_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, u_int seq); static struct auth_ops authsspi_ops = { authsspi_nextverf, @@ -143,7 +143,7 @@ authsspi_create_default(CLIENT *clnt, char *service, int svc) log_debug("in authgss_create_default() for %s", service); sname.value = service; - sname.length = strlen(service); + sname.length = (int)strlen(service); #if 0 maj_stat = gss_import_name(&min_stat, &sname, (gss_OID)GSS_C_NT_HOSTBASED_SERVICE, @@ -781,7 +781,7 @@ out: return maj_stat; } -uint32_t sspi_upwrap(PCtxtHandle ctx, sspi_buffer_desc *bufin, +uint32_t sspi_unwrap(PCtxtHandle ctx, sspi_buffer_desc *bufin, sspi_buffer_desc *bufout, u_int *conf_state, u_int *qop_state) { diff --git a/libtirpc/src/authsspi_prot.c b/libtirpc/src/authsspi_prot.c index 5539faa..b1eba5b 100644 --- a/libtirpc/src/authsspi_prot.c +++ b/libtirpc/src/authsspi_prot.c @@ -248,7 +248,7 @@ xdr_rpc_sspi_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, maj_stat = gss_unwrap(&min_stat, ctx, &wrapbuf, &databuf, &conf_state, &qop_state); #else - maj_stat = sspi_upwrap(ctx, &wrapbuf, &databuf, &conf_state, &qop_state); + maj_stat = sspi_unwrap(ctx, &wrapbuf, &databuf, &conf_state, &qop_state); #endif #if 0 gss_release_buffer(&min_stat, &wrapbuf);