* kadm_rpc_xdr.c: Add xdr_krb5_ui_2.

	(xdr_krb5_tl_data): Change local variable from int to unsigned int.

	* admin_xdr.h: Add prototype for xdr_krb5_ui_2.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13642 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 7b60b2c50462df2d429e40df216014723e16c51f..4a1184156a4654b4fbe8ca52f2917fa0dbe87ea2 100644 (file)
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-25  Ezra Peisach  <epeisach@mit.edu>
+
+       * kadm_rpc_xdr.c: Add xdr_krb5_ui_2. 
+       (xdr_krb5_tl_data): Change local variable from int to unsigned int. 
+
+       * admin_xdr.h: Add prototype for xdr_krb5_ui_2. 
+
 2001-07-08  Ezra Peisach  <epeisach@mit.edu>
 
        * logger.c (severity2string): Declare as returning const char *.

diff --git a/src/lib/kadm5/admin_xdr.h b/src/lib/kadm5/admin_xdr.h
index 5a2566ef943a206ae2e53aa6cc8d7c3b5be020c6..305502541d407498005b591ce28644fd1682145c 100644 (file)
--- a/src/lib/kadm5/admin_xdr.h
+++ b/src/lib/kadm5/admin_xdr.h
@@ -3,62 +3,6 @@
  *
  * $Header$
  * 
- * $Log$
- * Revision 1.6  2001/02/18 23:00:08  epeisach
- *     * server_internal.h: Add prototype for
- *         krb5_free_key_data_contents() which really should be in libkdb.
- *
- *     * kadm_rpc_xdr.c: Include krb5/admin_xdr.h for prototypes.
- *
- *     * kadm_rpc.h: Add prototypes for client and server stub
- *         functions. Server functions renamed to have _svc appended.
- *
- *     * alt_prof.c: Clean up warnings. Do not shadow index() with local
- *         variable.
- *
- *     * admin_xdr.h: Add prototypes for xdr_nulltype(), xdr_krb5_ui_4(),
- *         xdr_krb5_int16(), xdr_krb5_key_data_nocontents(),
- *         xdr_krb5_key_salt_tuple(), xdr_krb5_tl_data(),
- *         xdr_kadm5_principal_ent_rec_v1(), xdr_cprinc3_arg(),
- *         xdr_generic_ret(0, xdr_chpass3_arg(), xdr_setv4key_arg(),
- *         xdr_setkey_arg(), xdr_setkey3_arg(), xdr_chrand3_arg(),
- *         xdr_gprincs_arg(), xdr_grpincs_ret(), xdr_gpols_arg(),
- *         xdr_gpols_ret(), xdr_getprivs_ret(), xdr_krb5_salttype().
- *
- *     * admin_internal.h: Add prototype for _kadm5_check_handle().
- *
- *     * admin.h: Add prototypes for kadm5_free_config_params(),
- *         kadm5_decrypt_key(), ovsec_kadm_free_name_list().
- *
- *     * adb.h: Add prototypes for xdr_osa_pw_hist_ent(),
- *         xdr_krb5_key_data(), osa_adb_rename_db(),
- *         osa_adb_rename_policy_db().
- *
- * Revision 1.5  1996/07/22 20:35:33  marc
- * this commit includes all the changes on the OV_9510_INTEGRATION and
- * OV_MERGE branches.  This includes, but is not limited to, the new openvision
- * admin system, and major changes to gssapi to add functionality, and bring
- * the implementation in line with rfc1964.  before committing, the
- * code was built and tested for netbsd and solaris.
- *
- * Revision 1.4.4.1  1996/07/18 03:08:25  marc
- * merged in changes from OV_9510_BP to OV_9510_FINAL1
- *
- * Revision 1.4.2.1  1996/06/20  02:16:37  marc
- * File added to the repository on a branch
- *
- * Revision 1.4  1996/05/30  16:36:34  bjaspan
- * finish updating to kadm5 naming (oops)
- *
- * Revision 1.3  1996/05/22 00:28:19  bjaspan
- * rename to kadm5
- *
- * Revision 1.2  1996/05/12 06:30:10  marc
- *  - fixup includes and data types to match beta6
- *
- * Revision 1.1  1993/11/09  04:06:01  shanzer
- * Initial revision
- *
  */
 
 #include    <kadm5/admin.h>
@@ -73,6 +17,7 @@ bool_t            xdr_krb5_deltat(XDR *xdrs, krb5_deltat *objp);
 bool_t     xdr_krb5_flags(XDR *xdrs, krb5_flags *objp);
 bool_t      xdr_krb5_ui_4(XDR *xdrs, krb5_ui_4 *objp);
 bool_t      xdr_krb5_int16(XDR *xdrs, krb5_int16 *objp);
+bool_t      xdr_krb5_ui_2(XDR *xdrs, krb5_ui_2 *objp);
 bool_t      xdr_krb5_key_data_nocontents(XDR *xdrs, krb5_key_data *objp);
 bool_t      xdr_krb5_key_salt_tuple(XDR *xdrs, krb5_key_salt_tuple *objp);
 bool_t      xdr_krb5_tl_data(XDR *xdrs, krb5_tl_data **tl_data_head);

diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index 4424fc0eb9051341a7d7e7596225f9461733f708..57f1ffea78aebe5ca6fd7e1656db220c479bbfe7 100644 (file)
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -196,6 +196,30 @@ xdr_krb5_int16(XDR *xdrs, krb5_int16 *objp)
     return(TRUE);
 }
 
+/*
+ * Function: xdr_krb5_ui_2
+ *
+ * Purpose: XDR function which serves as a wrapper for xdr_u_int,
+ * to prevent compiler warnings about type clashes between u_int
+ * and krb5_ui_2.
+ */
+bool_t
+xdr_krb5_ui_2(XDR *xdrs, krb5_ui_2 *objp)
+{
+    unsigned int tmp;
+
+    tmp = (unsigned int) *objp;
+
+    if (!xdr_u_int(xdrs, &tmp))
+       return(FALSE);
+
+    *objp = (krb5_ui_2) tmp;
+
+    return(TRUE);
+}
+
+
+
 bool_t xdr_krb5_key_data_nocontents(XDR *xdrs, krb5_key_data *objp)
 {
      /*
@@ -258,7 +282,7 @@ bool_t xdr_krb5_tl_data(XDR *xdrs, krb5_tl_data **tl_data_head)
 {
      krb5_tl_data *tl, *tl2;
      bool_t more;
-     int len;
+     unsigned int len;
 
      switch (xdrs->x_op) {
      case XDR_FREE: