* 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

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index e2dcd5a3c8b26f34ded005092eb86c02788a9b03..7f5f83f8ab275264faf4917fd551cdb44b2f29e0 100644 (file)
--- 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 9c22abdf0a20c46fbc81b234bca53c820ac5b001..89167e58322ca10a1ab00386d3190a7a4e586049 100644 (file)
--- 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 7f4aae5f87f92237245781c7549a57bc1c7253a6..fe2bd9797ee0d7b0c653145d36ba67e80fd83705 100644 (file)
--- 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 46223bbfb08cd9904ceea52192cd923be4d378ae..161a21df65abff89c16e37f0b65001ebb1b859a6 100644 (file)
--- 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  */