diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-07-25 17:47:28 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-07-25 17:47:28 +0000 |
| commit | 5707cf39014781a41df1aded840ee597d250af0c (patch) | |
| tree | ea32ebdf393ce301f31bd80601fa475c7cba75f5 /src/lib/rpc | |
| parent | e17f6194d3b238d4dfb67f14a9b18f3449ab5975 (diff) | |
| download | krb5-5707cf39014781a41df1aded840ee597d250af0c.tar.gz krb5-5707cf39014781a41df1aded840ee597d250af0c.tar.xz krb5-5707cf39014781a41df1aded840ee597d250af0c.zip | |
* auth_gssapi.c (auth_gssapi_create): Change calling convention
from passing ints as arguments to OM_uint32 to match spec for
gss_init_sec_context.
* auth_gssapi.h: Update prototype for auth_gssapi_create.
* svc.h (struct svc_req): The rq_clntcred and rq_svccred elements
are now void *.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13639 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc')
| -rw-r--r-- | src/lib/rpc/ChangeLog | 11 | ||||
| -rw-r--r-- | src/lib/rpc/auth_gssapi.c | 7 | ||||
| -rw-r--r-- | src/lib/rpc/auth_gssapi.h | 4 | ||||
| -rw-r--r-- | src/lib/rpc/svc.h | 4 |
4 files changed, 19 insertions, 7 deletions
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index e2dcd5a3c8..7f5f83f8ab 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,14 @@ +2001-07-25 Ezra Peisach <epeisach@mit.edu> + + * auth_gssapi.c (auth_gssapi_create): Change calling convention + from passing ints as arguments to OM_uint32 to match spec for + gss_init_sec_context. + + * auth_gssapi.h: Update prototype for auth_gssapi_create. + + * svc.h (struct svc_req): The rq_clntcred and rq_svccred elements + are now void *. + 2001-07-19 Ezra Peisach <epeisach@mit.edu> * xdr_mem.c: Do not assume that XDR x_private field is char *. diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c index 9c22abdf0a..89167e5832 100644 --- a/src/lib/rpc/auth_gssapi.c +++ b/src/lib/rpc/auth_gssapi.c @@ -138,10 +138,10 @@ AUTH *auth_gssapi_create(clnt, gssstat, minor_stat, gss_cred_id_t claimant_cred_handle; gss_name_t target_name; gss_OID mech_type; - int req_flags; + OM_uint32 req_flags; OM_uint32 time_req; gss_OID *actual_mech_type; - int *ret_flags; + OM_uint32 *ret_flags; OM_uint32 *time_rec; { AUTH *auth, *save_auth; @@ -150,7 +150,8 @@ AUTH *auth_gssapi_create(clnt, gssstat, minor_stat, struct sockaddr_in laddr, raddr; enum clnt_stat callstat; struct timeval timeout; - int init_func, bindings_failed; + int bindings_failed; + rpc_u_int32 init_func; auth_gssapi_init_arg call_arg; auth_gssapi_init_res call_res; diff --git a/src/lib/rpc/auth_gssapi.h b/src/lib/rpc/auth_gssapi.h index 7f4aae5f87..fe2bd9797e 100644 --- a/src/lib/rpc/auth_gssapi.h +++ b/src/lib/rpc/auth_gssapi.h @@ -100,10 +100,10 @@ PROTOTYPE((CLIENT *clnt, gss_cred_id_t claimant_cred_handle, gss_name_t target_name, gss_OID mech_type, - int req_flags, + OM_uint32 req_flags, OM_uint32 time_req, gss_OID *actual_mech_type, - int *ret_flags, + OM_uint32 *ret_flags, OM_uint32 *time_rec)); AUTH *auth_gssapi_create_default diff --git a/src/lib/rpc/svc.h b/src/lib/rpc/svc.h index 46223bbfb0..161a21df65 100644 --- a/src/lib/rpc/svc.h +++ b/src/lib/rpc/svc.h @@ -160,8 +160,8 @@ struct svc_req { rpc_u_int32 rq_vers; /* service protocol version */ rpc_u_int32 rq_proc; /* the desired procedure */ struct opaque_auth rq_cred; /* raw creds from the wire */ - caddr_t rq_clntcred; /* read only cooked client cred */ - caddr_t rq_svccred; /* read only cooked svc cred */ + void * rq_clntcred; /* read only cooked client cred */ + void * rq_svccred; /* read only cooked svc cred */ SVCXPRT *rq_xprt; /* associated transport */ /* The request's auth flavor *should* be here, but the svc_req */ |