oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename u_intXX_t to uintXX_t

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17447 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-05 10:52:01 +00:00
parent aa476ab965
commit 652da91adb
13 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kadmin/get.c
View File

@@ -42,7 +42,7 @@ static struct field_name {
const char *fieldname; const char *fieldname;
unsigned int fieldvalue; unsigned int fieldvalue;
unsigned int subvalue; unsigned int subvalue;
u_int32_t extra_mask; uint32_t extra_mask;
const char *default_header; const char *default_header;
const char *def_longheader; const char *def_longheader;
unsigned int flags; unsigned int flags;
@@ -77,8 +77,8 @@ struct field_info {
struct get_entry_data { struct get_entry_data {
void (*format)(struct get_entry_data*, kadm5_principal_ent_t); void (*format)(struct get_entry_data*, kadm5_principal_ent_t);
rtbl_t table; rtbl_t table;
u_int32_t mask; uint32_t mask;
u_int32_t extra_mask; uint32_t extra_mask;
struct field_info *chead, **ctail; struct field_info *chead, **ctail;
}; };

2
kadmin/init.c
View File

@@ -41,7 +41,7 @@ static kadm5_ret_t
create_random_entry(krb5_principal princ, create_random_entry(krb5_principal princ,
unsigned max_life, unsigned max_life,
unsigned max_rlife, unsigned max_rlife,
u_int32_t attributes) uint32_t attributes)
{ {
kadm5_principal_ent_rec ent; kadm5_principal_ent_rec ent;
kadm5_ret_t ret; kadm5_ret_t ret;

2
kadmin/kadmin.c
View File

@@ -150,7 +150,7 @@ usage(int ret)
int int
get_privs(void *opt, int argc, char **argv) get_privs(void *opt, int argc, char **argv)
{ {
u_int32_t privs; uint32_t privs;
char str[128]; char str[128];
kadm5_ret_t ret; kadm5_ret_t ret;

5
kcm/acl.c
View File

@@ -42,7 +42,7 @@ kcm_access(krb5_context context,
{ {
int read_p = 0; int read_p = 0;
int write_p = 0; int write_p = 0;
u_int16_t mask; uint16_t mask;
krb5_error_code ret; krb5_error_code ret;
KCM_ASSERT_VALID(ccache); KCM_ASSERT_VALID(ccache);
@@ -57,6 +57,7 @@ kcm_access(krb5_context context,
case KCM_OP_CHMOD: case KCM_OP_CHMOD:
case KCM_OP_GET_INITIAL_TICKET: case KCM_OP_GET_INITIAL_TICKET:
case KCM_OP_GET_TICKET: case KCM_OP_GET_TICKET:
case KCM_OP_CC_SET_DEFAULT:
write_p = 1; write_p = 1;
read_p = 0; read_p = 0;
break; break;
@@ -125,7 +126,7 @@ krb5_error_code
kcm_chmod(krb5_context context, kcm_chmod(krb5_context context,
kcm_client *client, kcm_client *client,
kcm_ccache ccache, kcm_ccache ccache,
u_int16_t mode) uint16_t mode)
{ {
KCM_ASSERT_VALID(ccache); KCM_ASSERT_VALID(ccache);

6
kcm/cursor.c
View File

@@ -38,7 +38,7 @@ krb5_error_code
kcm_cursor_new(krb5_context context, kcm_cursor_new(krb5_context context,
pid_t pid, pid_t pid,
kcm_ccache ccache, kcm_ccache ccache,
u_int32_t *cursor) uint32_t *cursor)
{ {
kcm_cursor **p; kcm_cursor **p;
krb5_error_code ret; krb5_error_code ret;
@@ -76,7 +76,7 @@ krb5_error_code
kcm_cursor_find(krb5_context context, kcm_cursor_find(krb5_context context,
pid_t pid, pid_t pid,
kcm_ccache ccache, kcm_ccache ccache,
u_int32_t key, uint32_t key,
kcm_cursor **cursor) kcm_cursor **cursor)
{ {
kcm_cursor *p; kcm_cursor *p;
@@ -113,7 +113,7 @@ krb5_error_code
kcm_cursor_delete(krb5_context context, kcm_cursor_delete(krb5_context context,
pid_t pid, pid_t pid,
kcm_ccache ccache, kcm_ccache ccache,
u_int32_t key) uint32_t key)
{ {
kcm_cursor **p; kcm_cursor **p;
krb5_error_code ret; krb5_error_code ret;

8
kcm/kcm_locl.h
View File

@@ -67,7 +67,7 @@ struct kcm_creds;
typedef struct kcm_cursor { typedef struct kcm_cursor {
pid_t pid; pid_t pid;
u_int32_t key; uint32_t key;
struct kcm_creds *credp; /* pointer to next credential */ struct kcm_creds *credp; /* pointer to next credential */
struct kcm_cursor *next; struct kcm_cursor *next;
} kcm_cursor; } kcm_cursor;
@@ -75,8 +75,8 @@ typedef struct kcm_cursor {
typedef struct kcm_ccache_data { typedef struct kcm_ccache_data {
char *name; char *name;
unsigned refcnt; unsigned refcnt;
u_int16_t flags; uint16_t flags;
u_int16_t mode; uint16_t mode;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
krb5_principal client; /* primary client principal */ 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 */ krb5_creds cred; /* XXX would be useful for have ACLs on creds */
struct kcm_creds *next; struct kcm_creds *next;
} *creds; } *creds;
u_int32_t n_cursor; uint32_t n_cursor;
kcm_cursor *cursors; kcm_cursor *cursors;
krb5_deltat tkt_life; krb5_deltat tkt_life;
krb5_deltat renew_life; krb5_deltat renew_life;

20
kcm/protocol.c
View File

@@ -289,7 +289,7 @@ kcm_op_retrieve(krb5_context context,
krb5_storage *request, krb5_storage *request,
krb5_storage *response) krb5_storage *response)
{ {
u_int32_t flags; uint32_t flags;
krb5_creds mcreds; krb5_creds mcreds;
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
@@ -424,7 +424,7 @@ kcm_op_get_first(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
u_int32_t cursor; uint32_t cursor;
char *name; char *name;
ret = krb5_ret_stringz(request, &name); ret = krb5_ret_stringz(request, &name);
@@ -473,7 +473,7 @@ kcm_op_get_next(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
char *name; char *name;
u_int32_t cursor; uint32_t cursor;
kcm_cursor *c; kcm_cursor *c;
ret = krb5_ret_stringz(request, &name); ret = krb5_ret_stringz(request, &name);
@@ -534,7 +534,7 @@ kcm_op_end_get(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
u_int32_t cursor; uint32_t cursor;
char *name; char *name;
ret = krb5_ret_stringz(request, &name); ret = krb5_ret_stringz(request, &name);
@@ -580,7 +580,7 @@ kcm_op_remove_cred(krb5_context context,
krb5_storage *request, krb5_storage *request,
krb5_storage *response) krb5_storage *response)
{ {
u_int32_t whichfields; uint32_t whichfields;
krb5_creds mcreds; krb5_creds mcreds;
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
@@ -638,7 +638,7 @@ kcm_op_set_flags(krb5_context context,
krb5_storage *request, krb5_storage *request,
krb5_storage *response) krb5_storage *response)
{ {
u_int32_t flags; uint32_t flags;
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
char *name; char *name;
@@ -685,8 +685,8 @@ kcm_op_chown(krb5_context context,
krb5_storage *request, krb5_storage *request,
krb5_storage *response) krb5_storage *response)
{ {
u_int32_t uid; uint32_t uid;
u_int32_t gid; uint32_t gid;
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
char *name; char *name;
@@ -739,7 +739,7 @@ kcm_op_chmod(krb5_context context,
krb5_storage *request, krb5_storage *request,
krb5_storage *response) krb5_storage *response)
{ {
u_int16_t mode; uint16_t mode;
krb5_error_code ret; krb5_error_code ret;
kcm_ccache ccache; kcm_ccache ccache;
char *name; char *name;
@@ -990,7 +990,7 @@ kcm_dispatch(krb5_context context,
kcm_method method; kcm_method method;
krb5_storage *req_sp = NULL; krb5_storage *req_sp = NULL;
krb5_storage *resp_sp = NULL; krb5_storage *resp_sp = NULL;
u_int16_t opcode; uint16_t opcode;
resp_sp = krb5_storage_emem(); resp_sp = krb5_storage_emem();
if (resp_sp == NULL) { if (resp_sp == NULL) {

2
kdc/hpropd.c
View File

@@ -126,7 +126,7 @@ dump_krb4(krb5_context context, hdb_entry *ent, int fd)
free(p); 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, kdb_encrypt_key((des_cblock*)key, (des_cblock*)key,
&mkey4, msched4, DES_ENCRYPT); &mkey4, msched4, DES_ENCRYPT);
asprintf(&p, "%x %x ", (int)htonl(*key), (int)htonl(*(key+1))); asprintf(&p, "%x %x ", (int)htonl(*key), (int)htonl(*(key+1)));

8
kdc/kaserver.c
View File

@@ -193,7 +193,7 @@ init_reply_header (struct rx_header *hdr,
static void static void
make_error_reply (struct rx_header *hdr, make_error_reply (struct rx_header *hdr,
u_int32_t ret, uint32_t ret,
krb5_data *reply) krb5_data *reply)
{ {
@@ -280,7 +280,7 @@ create_reply_ticket (krb5_context context,
int kvno, int kvno,
int32_t max_seq_len, int32_t max_seq_len,
const char *sname, const char *sinstance, const char *sname, const char *sinstance,
u_int32_t challenge, uint32_t challenge,
const char *label, const char *label,
krb5_keyblock *key, krb5_keyblock *key,
krb5_data *reply) krb5_data *reply)
@@ -442,7 +442,7 @@ do_authenticate (krb5_context context,
Key *skey = NULL; Key *skey = NULL;
krb5_storage *reply_sp; krb5_storage *reply_sp;
time_t max_life; time_t max_life;
u_int8_t life; uint8_t life;
int32_t chal; int32_t chal;
char client_name[256]; char client_name[256];
char server_name[256]; char server_name[256];
@@ -871,7 +871,7 @@ _kdc_do_kaserver(krb5_context context,
{ {
krb5_error_code ret = 0; krb5_error_code ret = 0;
struct rx_header hdr; struct rx_header hdr;
u_int32_t op; uint32_t op;
krb5_storage *sp; krb5_storage *sp;
if (len < RX_HEADER_SIZE) if (len < RX_HEADER_SIZE)

6
kdc/kerberos4.c
View File

@@ -38,8 +38,8 @@
RCSID("$Id$"); RCSID("$Id$");
#ifndef swap32 #ifndef swap32
static u_int32_t static uint32_t
swap32(u_int32_t x) swap32(uint32_t x)
{ {
return ((x << 24) & 0xff000000) | return ((x << 24) & 0xff000000) |
((x << 8) & 0xff0000) | ((x << 8) & 0xff0000) |
@@ -144,7 +144,7 @@ _kdc_do_version4(krb5_context context,
char *sname = NULL, *sinst = NULL; char *sname = NULL, *sinst = NULL;
int32_t req_time; int32_t req_time;
time_t max_life; time_t max_life;
u_int8_t life; uint8_t life;
char client_name[256]; char client_name[256];
char server_name[256]; char server_name[256];

14
kdc/rx.h
View File

@@ -59,17 +59,17 @@ enum rx_header_flag {
}; };
struct rx_header { struct rx_header {
u_int32_t epoch; uint32_t epoch;
u_int32_t connid; /* And channel ID */ uint32_t connid; /* And channel ID */
u_int32_t callid; uint32_t callid;
u_int32_t seqno; uint32_t seqno;
u_int32_t serialno; uint32_t serialno;
u_char type; u_char type;
u_char flags; u_char flags;
u_char status; u_char status;
u_char secindex; u_char secindex;
u_int16_t reserved; /* ??? verifier? */ uint16_t reserved; /* ??? verifier? */
u_int16_t serviceid; uint16_t serviceid;
/* This should be the other way around according to everything but */ /* This should be the other way around according to everything but */
/* tcpdump */ /* tcpdump */
}; };

16
kpasswd/kpasswdd.c
View File

@@ -74,7 +74,7 @@ send_reply (int s,
{ {
struct msghdr msghdr; struct msghdr msghdr;
struct iovec iov[3]; struct iovec iov[3];
u_int16_t len, ap_rep_len; uint16_t len, ap_rep_len;
u_char header[6]; u_char header[6];
u_char *p; u_char *p;
@@ -120,7 +120,7 @@ send_reply (int s,
static int static int
make_result (krb5_data *data, make_result (krb5_data *data,
u_int16_t result_code, uint16_t result_code,
const char *expl) const char *expl)
{ {
krb5_data_zero (data); krb5_data_zero (data);
@@ -144,7 +144,7 @@ reply_error (krb5_realm realm,
struct sockaddr *sa, struct sockaddr *sa,
int sa_size, int sa_size,
krb5_error_code error_code, krb5_error_code error_code,
u_int16_t result_code, uint16_t result_code,
const char *expl) const char *expl)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -189,7 +189,7 @@ reply_priv (krb5_auth_context auth_context,
int s, int s,
struct sockaddr *sa, struct sockaddr *sa,
int sa_size, int sa_size,
u_int16_t result_code, uint16_t result_code,
const char *expl) const char *expl)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -231,7 +231,7 @@ reply_priv (krb5_auth_context auth_context,
static void static void
change (krb5_auth_context auth_context, change (krb5_auth_context auth_context,
krb5_principal admin_principal, krb5_principal admin_principal,
u_int16_t version, uint16_t version,
int s, int s,
struct sockaddr *sa, struct sockaddr *sa,
int sa_size, int sa_size,
@@ -427,7 +427,7 @@ verify (krb5_auth_context *auth_context,
krb5_keytab keytab, krb5_keytab keytab,
krb5_ticket **ticket, krb5_ticket **ticket,
krb5_data *out_data, krb5_data *out_data,
u_int16_t *version, uint16_t *version,
int s, int s,
struct sockaddr *sa, struct sockaddr *sa,
int sa_size, int sa_size,
@@ -435,7 +435,7 @@ verify (krb5_auth_context *auth_context,
size_t len) size_t len)
{ {
krb5_error_code ret; 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 ap_req_data;
krb5_data krb_priv_data; krb5_data krb_priv_data;
krb5_realm *r; krb5_realm *r;
@@ -553,7 +553,7 @@ process (krb5_realm *realms,
krb5_data out_data; krb5_data out_data;
krb5_ticket *ticket; krb5_ticket *ticket;
krb5_address other_addr; krb5_address other_addr;
u_int16_t version; uint16_t version;
krb5_data_zero (&out_data); krb5_data_zero (&out_data);

2
kuser/klist.c
View File

@@ -488,7 +488,7 @@ display_v4_tickets (int do_verbose)
static void static void
display_tokens(int do_verbose) display_tokens(int do_verbose)
{ {
u_int32_t i; uint32_t i;
unsigned char t[4096]; unsigned char t[4096];
struct ViceIoctl parms; struct ViceIoctl parms;