From 652da91adb5401b7e19d218bd656edd6532d051a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Fri, 5 May 2006 10:52:01 +0000
Subject: [PATCH] Rename u_intXX_t to uintXX_t

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17447 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kadmin/get.c       |  6 +++---
 kadmin/init.c      |  2 +-
 kadmin/kadmin.c    |  2 +-
 kcm/acl.c          |  5 +++--
 kcm/cursor.c       |  6 +++---
 kcm/kcm_locl.h     |  8 ++++----
 kcm/protocol.c     | 20 ++++++++++----------
 kdc/hpropd.c       |  2 +-
 kdc/kaserver.c     |  8 ++++----
 kdc/kerberos4.c    |  6 +++---
 kdc/rx.h           | 14 +++++++-------
 kpasswd/kpasswdd.c | 16 ++++++++--------
 kuser/klist.c      |  2 +-
 13 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/kadmin/get.c b/kadmin/get.c
index a9d626083..89e065934 100644
--- a/kadmin/get.c
+++ b/kadmin/get.c
@@ -42,7 +42,7 @@ static struct field_name {
     const char *fieldname;
     unsigned int fieldvalue;
     unsigned int subvalue;
-    u_int32_t extra_mask;
+    uint32_t extra_mask;
     const char *default_header;
     const char *def_longheader;
     unsigned int flags;
@@ -77,8 +77,8 @@ struct field_info {
 struct get_entry_data {
     void (*format)(struct get_entry_data*, kadm5_principal_ent_t);
     rtbl_t table;
-    u_int32_t mask;
-    u_int32_t extra_mask;
+    uint32_t mask;
+    uint32_t extra_mask;
     struct field_info *chead, **ctail;
 };
 
diff --git a/kadmin/init.c b/kadmin/init.c
index bff986f2d..864623fb7 100644
--- a/kadmin/init.c
+++ b/kadmin/init.c
@@ -41,7 +41,7 @@ static kadm5_ret_t
 create_random_entry(krb5_principal princ,
 		    unsigned max_life,
 		    unsigned max_rlife,
-		    u_int32_t attributes)
+		    uint32_t attributes)
 {
     kadm5_principal_ent_rec ent;
     kadm5_ret_t ret;
diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index 4ab233b47..3138fcd34 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -150,7 +150,7 @@ usage(int ret)
 int
 get_privs(void *opt, int argc, char **argv)
 {
-    u_int32_t privs;
+    uint32_t privs;
     char str[128];
     kadm5_ret_t ret;
     
diff --git a/kcm/acl.c b/kcm/acl.c
index d64b9c23e..1f5f82210 100644
--- a/kcm/acl.c
+++ b/kcm/acl.c
@@ -42,7 +42,7 @@ kcm_access(krb5_context context,
 {
     int read_p = 0;
     int write_p = 0;
-    u_int16_t mask;
+    uint16_t mask;
     krb5_error_code ret;
 
     KCM_ASSERT_VALID(ccache);
@@ -57,6 +57,7 @@ kcm_access(krb5_context context,
     case KCM_OP_CHMOD:
     case KCM_OP_GET_INITIAL_TICKET:
     case KCM_OP_GET_TICKET:
+    case KCM_OP_CC_SET_DEFAULT:
 	write_p = 1;
 	read_p = 0;
 	break;
@@ -125,7 +126,7 @@ krb5_error_code
 kcm_chmod(krb5_context context,
 	  kcm_client *client,
 	  kcm_ccache ccache,
-	  u_int16_t mode)
+	  uint16_t mode)
 {
     KCM_ASSERT_VALID(ccache);
 
diff --git a/kcm/cursor.c b/kcm/cursor.c
index aa6f2777e..b943eb9ef 100644
--- a/kcm/cursor.c
+++ b/kcm/cursor.c
@@ -38,7 +38,7 @@ krb5_error_code
 kcm_cursor_new(krb5_context context,
 	       pid_t pid,
 	       kcm_ccache ccache,
-	       u_int32_t *cursor)
+	       uint32_t *cursor)
 {
     kcm_cursor **p;
     krb5_error_code ret;
@@ -76,7 +76,7 @@ krb5_error_code
 kcm_cursor_find(krb5_context context,
 		pid_t pid,
 		kcm_ccache ccache,
-		u_int32_t key,
+		uint32_t key,
 		kcm_cursor **cursor)
 {
     kcm_cursor *p;
@@ -113,7 +113,7 @@ krb5_error_code
 kcm_cursor_delete(krb5_context context,
 	     	  pid_t pid,
 		  kcm_ccache ccache,
-		  u_int32_t key)
+		  uint32_t key)
 {
     kcm_cursor **p;
     krb5_error_code ret;
diff --git a/kcm/kcm_locl.h b/kcm/kcm_locl.h
index b34c12833..32035ee9f 100644
--- a/kcm/kcm_locl.h
+++ b/kcm/kcm_locl.h
@@ -67,7 +67,7 @@ struct kcm_creds;
 
 typedef struct kcm_cursor {
     pid_t pid;
-    u_int32_t key;
+    uint32_t key;
     struct kcm_creds *credp;		/* pointer to next credential */ 
     struct kcm_cursor *next;
 } kcm_cursor;
@@ -75,8 +75,8 @@ typedef struct kcm_cursor {
 typedef struct kcm_ccache_data {
     char *name;
     unsigned refcnt;
-    u_int16_t flags;
-    u_int16_t mode;
+    uint16_t flags;
+    uint16_t mode;
     uid_t uid;
     gid_t gid;
     krb5_principal client; /* primary client principal */
@@ -85,7 +85,7 @@ typedef struct kcm_ccache_data {
 	krb5_creds cred; /* XXX would be useful for have ACLs on creds */
 	struct kcm_creds *next;
     } *creds;
-    u_int32_t n_cursor;
+    uint32_t n_cursor;
     kcm_cursor *cursors;
     krb5_deltat tkt_life;
     krb5_deltat renew_life;
diff --git a/kcm/protocol.c b/kcm/protocol.c
index c37de5635..81c3a45de 100644
--- a/kcm/protocol.c
+++ b/kcm/protocol.c
@@ -289,7 +289,7 @@ kcm_op_retrieve(krb5_context context,
 		krb5_storage *request,
 		krb5_storage *response)
 {
-    u_int32_t flags;
+    uint32_t flags;
     krb5_creds mcreds;
     krb5_error_code ret;
     kcm_ccache ccache;
@@ -424,7 +424,7 @@ kcm_op_get_first(krb5_context context,
 {
     krb5_error_code ret;
     kcm_ccache ccache;
-    u_int32_t cursor;
+    uint32_t cursor;
     char *name;
 
     ret = krb5_ret_stringz(request, &name);
@@ -473,7 +473,7 @@ kcm_op_get_next(krb5_context context,
     krb5_error_code ret;
     kcm_ccache ccache;
     char *name;
-    u_int32_t cursor;
+    uint32_t cursor;
     kcm_cursor *c;
 
     ret = krb5_ret_stringz(request, &name);
@@ -534,7 +534,7 @@ kcm_op_end_get(krb5_context context,
 {
     krb5_error_code ret;
     kcm_ccache ccache;
-    u_int32_t cursor;
+    uint32_t cursor;
     char *name;
 
     ret = krb5_ret_stringz(request, &name);
@@ -580,7 +580,7 @@ kcm_op_remove_cred(krb5_context context,
 		   krb5_storage *request,
 		   krb5_storage *response)
 {
-    u_int32_t whichfields;
+    uint32_t whichfields;
     krb5_creds mcreds;
     krb5_error_code ret;
     kcm_ccache ccache;
@@ -638,7 +638,7 @@ kcm_op_set_flags(krb5_context context,
 		 krb5_storage *request,
 		 krb5_storage *response)
 {
-    u_int32_t flags;
+    uint32_t flags;
     krb5_error_code ret;
     kcm_ccache ccache;
     char *name;
@@ -685,8 +685,8 @@ kcm_op_chown(krb5_context context,
 	     krb5_storage *request,
 	     krb5_storage *response)
 {
-    u_int32_t uid;
-    u_int32_t gid;
+    uint32_t uid;
+    uint32_t gid;
     krb5_error_code ret;
     kcm_ccache ccache;
     char *name;
@@ -739,7 +739,7 @@ kcm_op_chmod(krb5_context context,
 	     krb5_storage *request,
 	     krb5_storage *response)
 {
-    u_int16_t mode;
+    uint16_t mode;
     krb5_error_code ret;
     kcm_ccache ccache;
     char *name;
@@ -990,7 +990,7 @@ kcm_dispatch(krb5_context context,
     kcm_method method;
     krb5_storage *req_sp = NULL;
     krb5_storage *resp_sp = NULL;
-    u_int16_t opcode;
+    uint16_t opcode;
 
     resp_sp = krb5_storage_emem();
     if (resp_sp == NULL) {
diff --git a/kdc/hpropd.c b/kdc/hpropd.c
index a17596231..d34858a38 100644
--- a/kdc/hpropd.c
+++ b/kdc/hpropd.c
@@ -126,7 +126,7 @@ dump_krb4(krb5_context context, hdb_entry *ent, int fd)
     free(p);
 
     { 
-	u_int32_t *key = ent->keys.val[i].key.keyvalue.data;
+	uint32_t *key = ent->keys.val[i].key.keyvalue.data;
 	kdb_encrypt_key((des_cblock*)key, (des_cblock*)key,
 			&mkey4, msched4, DES_ENCRYPT);
 	asprintf(&p, "%x %x ", (int)htonl(*key), (int)htonl(*(key+1)));
diff --git a/kdc/kaserver.c b/kdc/kaserver.c
index 8e83f009a..6a11a4b82 100644
--- a/kdc/kaserver.c
+++ b/kdc/kaserver.c
@@ -193,7 +193,7 @@ init_reply_header (struct rx_header *hdr,
 
 static void
 make_error_reply (struct rx_header *hdr,
-		  u_int32_t ret,
+		  uint32_t ret,
 		  krb5_data *reply)
 
 {
@@ -280,7 +280,7 @@ create_reply_ticket (krb5_context context,
 		     int kvno,
 		     int32_t max_seq_len,
 		     const char *sname, const char *sinstance,
-		     u_int32_t challenge,
+		     uint32_t challenge,
 		     const char *label,
 		     krb5_keyblock *key,
 		     krb5_data *reply)
@@ -442,7 +442,7 @@ do_authenticate (krb5_context context,
     Key *skey = NULL;
     krb5_storage *reply_sp;
     time_t max_life;
-    u_int8_t life;
+    uint8_t life;
     int32_t chal;
     char client_name[256];
     char server_name[256];
@@ -871,7 +871,7 @@ _kdc_do_kaserver(krb5_context context,
 {
     krb5_error_code ret = 0;
     struct rx_header hdr;
-    u_int32_t op;
+    uint32_t op;
     krb5_storage *sp;
 
     if (len < RX_HEADER_SIZE)
diff --git a/kdc/kerberos4.c b/kdc/kerberos4.c
index 7f4f9f39c..c27b16218 100644
--- a/kdc/kerberos4.c
+++ b/kdc/kerberos4.c
@@ -38,8 +38,8 @@
 RCSID("$Id$");
 
 #ifndef swap32
-static u_int32_t
-swap32(u_int32_t x)
+static uint32_t
+swap32(uint32_t x)
 {
     return ((x << 24) & 0xff000000) |
 	((x << 8) & 0xff0000) |
@@ -144,7 +144,7 @@ _kdc_do_version4(krb5_context context,
     char *sname = NULL, *sinst = NULL;
     int32_t req_time;
     time_t max_life;
-    u_int8_t life;
+    uint8_t life;
     char client_name[256];
     char server_name[256];
 
diff --git a/kdc/rx.h b/kdc/rx.h
index 422ed21ff..a84e5ec5f 100644
--- a/kdc/rx.h
+++ b/kdc/rx.h
@@ -59,17 +59,17 @@ enum rx_header_flag {
 };
 
 struct rx_header {
-     u_int32_t epoch;
-     u_int32_t connid;		/* And channel ID */
-     u_int32_t callid;
-     u_int32_t seqno;
-     u_int32_t serialno;
+     uint32_t epoch;
+     uint32_t connid;		/* And channel ID */
+     uint32_t callid;
+     uint32_t seqno;
+     uint32_t serialno;
      u_char type;
      u_char flags;
      u_char status;
      u_char secindex;
-     u_int16_t reserved;	/* ??? verifier? */
-     u_int16_t serviceid;
+     uint16_t reserved;	/* ??? verifier? */
+     uint16_t serviceid;
 /* This should be the other way around according to everything but */
 /* tcpdump */
 };
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 35dc7cb1b..6e4ca95e5 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -74,7 +74,7 @@ send_reply (int s,
 {
     struct msghdr msghdr;
     struct iovec iov[3];
-    u_int16_t len, ap_rep_len;
+    uint16_t len, ap_rep_len;
     u_char header[6];
     u_char *p;
 
@@ -120,7 +120,7 @@ send_reply (int s,
 
 static int
 make_result (krb5_data *data,
-	     u_int16_t result_code,
+	     uint16_t result_code,
 	     const char *expl)
 {
     krb5_data_zero (data);
@@ -144,7 +144,7 @@ reply_error (krb5_realm realm,
 	     struct sockaddr *sa,
 	     int sa_size,
 	     krb5_error_code error_code,
-	     u_int16_t result_code,
+	     uint16_t result_code,
 	     const char *expl)
 {
     krb5_error_code ret;
@@ -189,7 +189,7 @@ reply_priv (krb5_auth_context auth_context,
 	    int s,
 	    struct sockaddr *sa,
 	    int sa_size,
-	    u_int16_t result_code,
+	    uint16_t result_code,
 	    const char *expl)
 {
     krb5_error_code ret;
@@ -231,7 +231,7 @@ reply_priv (krb5_auth_context auth_context,
 static void
 change (krb5_auth_context auth_context,
 	krb5_principal admin_principal,
-	u_int16_t version,
+	uint16_t version,
 	int s,
 	struct sockaddr *sa,
 	int sa_size,
@@ -427,7 +427,7 @@ verify (krb5_auth_context *auth_context,
 	krb5_keytab keytab,
 	krb5_ticket **ticket,
 	krb5_data *out_data,
-	u_int16_t *version,
+	uint16_t *version,
 	int s,
 	struct sockaddr *sa,
 	int sa_size,
@@ -435,7 +435,7 @@ verify (krb5_auth_context *auth_context,
 	size_t len)
 {
     krb5_error_code ret;
-    u_int16_t pkt_len, pkt_ver, ap_req_len;
+    uint16_t pkt_len, pkt_ver, ap_req_len;
     krb5_data ap_req_data;
     krb5_data krb_priv_data;
     krb5_realm *r;
@@ -553,7 +553,7 @@ process (krb5_realm *realms,
     krb5_data out_data;
     krb5_ticket *ticket;
     krb5_address other_addr;
-    u_int16_t version;
+    uint16_t version;
 
 
     krb5_data_zero (&out_data);
diff --git a/kuser/klist.c b/kuser/klist.c
index 7edebe740..33d6196fa 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -488,7 +488,7 @@ display_v4_tickets (int do_verbose)
 static void
 display_tokens(int do_verbose)
 {
-    u_int32_t i;
+    uint32_t i;
     unsigned char t[4096];
     struct ViceIoctl parms;