From cb704efeeb2aa992d49525cb564feaa205d539a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 5 May 2006 10:37:46 +0000 Subject: [PATCH] Rename u_intXX_t to uintXX_t git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17445 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/45/mk_req.c | 2 +- lib/des/md4.c | 22 +++++++-------- lib/des/md5.c | 22 +++++++-------- lib/des/pkcs5.c | 2 +- lib/des/rijndael-alg-fst.c | 6 ++-- lib/des/rnd_keys.c | 6 ++-- lib/des/sha.c | 26 +++++++++--------- lib/des/sha256.c | 26 +++++++++--------- lib/gssapi/cfx.c | 12 ++++---- lib/gssapi/init_sec_context.c | 2 +- lib/gssapi/krb5/cfx.c | 12 ++++---- lib/gssapi/krb5/init_sec_context.c | 2 +- lib/gssapi/krb5/wrap.c | 2 +- lib/gssapi/wrap.c | 2 +- lib/hdb/mkey.c | 2 +- lib/hx509/name.c | 2 +- lib/kadm5/acl.c | 4 +-- lib/kadm5/ad.c | 10 +++---- lib/kadm5/common_glue.c | 8 +++--- lib/kadm5/create_c.c | 2 +- lib/kadm5/create_s.c | 12 ++++---- lib/kadm5/ent_setup.c | 6 ++-- lib/kadm5/get_c.c | 2 +- lib/kadm5/get_s.c | 2 +- lib/kadm5/iprop-log.c | 8 +++--- lib/kadm5/ipropd_master.c | 18 ++++++------ lib/kadm5/ipropd_slave.c | 2 +- lib/kadm5/log.c | 44 +++++++++++++++--------------- lib/kadm5/marshall.c | 8 +++--- lib/kadm5/modify_c.c | 2 +- lib/kadm5/modify_s.c | 6 ++-- lib/kadm5/password_quality.c | 8 +++--- lib/kadm5/privs_c.c | 2 +- lib/kadm5/privs_s.c | 2 +- 34 files changed, 147 insertions(+), 147 deletions(-) diff --git a/lib/45/mk_req.c b/lib/45/mk_req.c index cbff957ef..a86662f8f 100644 --- a/lib/45/mk_req.c +++ b/lib/45/mk_req.c @@ -42,7 +42,7 @@ static int lifetime = 255; static void build_request(KTEXT req, const char *name, const char *inst, const char *realm, - u_int32_t checksum) + uint32_t checksum) { struct timeval tv; krb5_storage *sp; diff --git a/lib/des/md4.c b/lib/des/md4.c index 68ca9329f..dfdd78c84 100644 --- a/lib/des/md4.c +++ b/lib/des/md4.c @@ -69,9 +69,9 @@ a = cshift(a + OP(b,c,d) + X[k] + i, s) #define DO3(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,H) static inline void -calc (struct md4 *m, u_int32_t *data) +calc (struct md4 *m, uint32_t *data) { - u_int32_t AA, BB, CC, DD; + uint32_t AA, BB, CC, DD; AA = A; BB = B; @@ -155,10 +155,10 @@ calc (struct md4 *m, u_int32_t *data) */ #if defined(WORDS_BIGENDIAN) -static inline u_int32_t -swap_u_int32_t (u_int32_t t) +static inline uint32_t +swap_uint32_t (uint32_t t) { - u_int32_t temp1, temp2; + uint32_t temp1, temp2; temp1 = cshift(t, 16); temp2 = temp1 >> 8; @@ -194,15 +194,15 @@ MD4_Update (struct md4 *m, const void *v, size_t len) if(offset == 64) { #if defined(WORDS_BIGENDIAN) int i; - u_int32_t current[16]; + uint32_t current[16]; struct x32 *u = (struct x32*)m->save; for(i = 0; i < 8; i++){ - current[2*i+0] = swap_u_int32_t(u[i].a); - current[2*i+1] = swap_u_int32_t(u[i].b); + current[2*i+0] = swap_uint32_t(u[i].a); + current[2*i+1] = swap_uint32_t(u[i].b); } calc(m, current); #else - calc(m, (u_int32_t*)m->save); + calc(m, (uint32_t*)m->save); #endif offset = 0; } @@ -241,10 +241,10 @@ MD4_Final (void *res, struct md4 *m) #if 0 { int i; - u_int32_t *r = (u_int32_t *)res; + uint32_t *r = (uint32_t *)res; for (i = 0; i < 4; ++i) - r[i] = swap_u_int32_t (m->counter[i]); + r[i] = swap_uint32_t (m->counter[i]); } #endif } diff --git a/lib/des/md5.c b/lib/des/md5.c index 2a84446c0..d6149cdc7 100644 --- a/lib/des/md5.c +++ b/lib/des/md5.c @@ -71,9 +71,9 @@ a = b + cshift(a + OP(b,c,d) + X[k] + (i), s) #define DO4(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,I) static inline void -calc (struct md5 *m, u_int32_t *data) +calc (struct md5 *m, uint32_t *data) { - u_int32_t AA, BB, CC, DD; + uint32_t AA, BB, CC, DD; AA = A; BB = B; @@ -179,10 +179,10 @@ calc (struct md5 *m, u_int32_t *data) */ #if defined(WORDS_BIGENDIAN) -static inline u_int32_t -swap_u_int32_t (u_int32_t t) +static inline uint32_t +swap_uint32_t (uint32_t t) { - u_int32_t temp1, temp2; + uint32_t temp1, temp2; temp1 = cshift(t, 16); temp2 = temp1 >> 8; @@ -218,15 +218,15 @@ MD5_Update (struct md5 *m, const void *v, size_t len) if(offset == 64){ #if defined(WORDS_BIGENDIAN) int i; - u_int32_t current[16]; + uint32_t current[16]; struct x32 *u = (struct x32*)m->save; for(i = 0; i < 8; i++){ - current[2*i+0] = swap_u_int32_t(u[i].a); - current[2*i+1] = swap_u_int32_t(u[i].b); + current[2*i+0] = swap_uint32_t(u[i].a); + current[2*i+1] = swap_uint32_t(u[i].b); } calc(m, current); #else - calc(m, (u_int32_t*)m->save); + calc(m, (uint32_t*)m->save); #endif offset = 0; } @@ -265,10 +265,10 @@ MD5_Final (void *res, struct md5 *m) #if 0 { int i; - u_int32_t *r = (u_int32_t *)res; + uint32_t *r = (uint32_t *)res; for (i = 0; i < 4; ++i) - r[i] = swap_u_int32_t (m->counter[i]); + r[i] = swap_uint32_t (m->counter[i]); } #endif } diff --git a/lib/des/pkcs5.c b/lib/des/pkcs5.c index 973cb4ff0..75e3d0967 100644 --- a/lib/des/pkcs5.c +++ b/lib/des/pkcs5.c @@ -57,7 +57,7 @@ PKCS5_PBKDF2_HMAC_SHA1(const void * password, size_t password_len, { size_t datalen, leftofkey, checksumsize; char *data, *tmpcksum; - u_int32_t keypart; + uint32_t keypart; const EVP_MD *md; unsigned long i; int j; diff --git a/lib/des/rijndael-alg-fst.c b/lib/des/rijndael-alg-fst.c index 64b5bc803..57f13177d 100644 --- a/lib/des/rijndael-alg-fst.c +++ b/lib/des/rijndael-alg-fst.c @@ -41,9 +41,9 @@ RCSID("$Id$"); #include /* the file should not be used from outside */ -typedef u_int8_t u8; -typedef u_int16_t u16; -typedef u_int32_t u32; +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; /* Te0[x] = S [x].[02, 01, 01, 03]; diff --git a/lib/des/rnd_keys.c b/lib/des/rnd_keys.c index bf955d305..4ff010420 100644 --- a/lib/des/rnd_keys.c +++ b/lib/des/rnd_keys.c @@ -82,8 +82,8 @@ static int sumFile (const char *name, int len, void *res) { - u_int32_t sum[2] = { 0, 0 }; - u_int32_t buf[1024*2]; + uint32_t sum[2] = { 0, 0 }; + uint32_t buf[1024*2]; int fd, i; fd = open (name, 0); @@ -148,7 +148,7 @@ md5sumFile (const char *name, int len, int32_t sum[4]) * based on an initial des key used as a seed. */ static DES_key_schedule sequence_seed; -static u_int32_t sequence_index[2]; +static uint32_t sequence_index[2]; /* * Random number generator based on ideas from truerand in cryptolib diff --git a/lib/des/sha.c b/lib/des/sha.c index 63c36fd62..24b3e42f9 100644 --- a/lib/des/sha.c +++ b/lib/des/sha.c @@ -72,7 +72,7 @@ SHA1_Init (struct sha *m) #define DO(t,f,k) \ do { \ - u_int32_t temp; \ + uint32_t temp; \ \ temp = cshift(AA, 5) + f(BB,CC,DD) + EE + data[t] + k; \ EE = DD; \ @@ -83,10 +83,10 @@ do { \ } while(0) static inline void -calc (struct sha *m, u_int32_t *in) +calc (struct sha *m, uint32_t *in) { - u_int32_t AA, BB, CC, DD, EE; - u_int32_t data[80]; + uint32_t AA, BB, CC, DD, EE; + uint32_t data[80]; int i; AA = A; @@ -204,11 +204,11 @@ calc (struct sha *m, u_int32_t *in) */ #if !defined(WORDS_BIGENDIAN) || defined(_CRAY) -static inline u_int32_t -swap_u_int32_t (u_int32_t t) +static inline uint32_t +swap_uint32_t (uint32_t t) { #define ROL(x,n) ((x)<<(n))|((x)>>(32-(n))) - u_int32_t temp1, temp2; + uint32_t temp1, temp2; temp1 = cshift(t, 16); temp2 = temp1 >> 8; @@ -244,15 +244,15 @@ SHA1_Update (struct sha *m, const void *v, size_t len) if(offset == 64){ #if !defined(WORDS_BIGENDIAN) || defined(_CRAY) int i; - u_int32_t current[16]; + uint32_t current[16]; struct x32 *u = (struct x32*)m->save; for(i = 0; i < 8; i++){ - current[2*i+0] = swap_u_int32_t(u[i].a); - current[2*i+1] = swap_u_int32_t(u[i].b); + current[2*i+0] = swap_uint32_t(u[i].a); + current[2*i+1] = swap_uint32_t(u[i].b); } calc(m, current); #else - calc(m, (u_int32_t*)m->save); + calc(m, (uint32_t*)m->save); #endif offset = 0; } @@ -291,10 +291,10 @@ SHA1_Final (void *res, struct sha *m) #if 0 { int i; - u_int32_t *r = (u_int32_t *)res; + uint32_t *r = (uint32_t *)res; for (i = 0; i < 5; ++i) - r[i] = swap_u_int32_t (m->counter[i]); + r[i] = swap_uint32_t (m->counter[i]); } #endif } diff --git a/lib/des/sha256.c b/lib/des/sha256.c index 25bc586e3..ba662393a 100644 --- a/lib/des/sha256.c +++ b/lib/des/sha256.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 2001, 2006 Kungliga Tekniska Högskolan + * Copyright (c) 2006 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -59,7 +59,7 @@ RCSID("$Id$"); #define G m->counter[6] #define H m->counter[7] -static const u_int32_t constant_256[64] = { +static const uint32_t constant_256[64] = { 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, @@ -94,10 +94,10 @@ SHA256_Init (SHA256_CTX *m) } static void -calc (SHA256_CTX *m, u_int32_t *in) +calc (SHA256_CTX *m, uint32_t *in) { - u_int32_t AA, BB, CC, DD, EE, FF, GG, HH; - u_int32_t data[64]; + uint32_t AA, BB, CC, DD, EE, FF, GG, HH; + uint32_t data[64]; int i; AA = A; @@ -116,7 +116,7 @@ calc (SHA256_CTX *m, u_int32_t *in) sigma0(data[i-15]) + data[i - 16]; for (i = 0; i < 64; i++) { - u_int32_t T1, T2; + uint32_t T1, T2; T1 = HH + Sigma1(EE) + Ch(EE, FF, GG) + constant_256[i] + data[i]; T2 = Sigma0(AA) + Maj(AA,BB,CC); @@ -146,11 +146,11 @@ calc (SHA256_CTX *m, u_int32_t *in) */ #if !defined(WORDS_BIGENDIAN) || defined(_CRAY) -static inline u_int32_t -swap_u_int32_t (u_int32_t t) +static inline uint32_t +swap_uint32_t (uint32_t t) { #define ROL(x,n) ((x)<<(n))|((x)>>(32-(n))) - u_int32_t temp1, temp2; + uint32_t temp1, temp2; temp1 = cshift(t, 16); temp2 = temp1 >> 8; @@ -186,15 +186,15 @@ SHA256_Update (SHA256_CTX *m, const void *v, size_t len) if(offset == 64){ #if !defined(WORDS_BIGENDIAN) || defined(_CRAY) int i; - u_int32_t current[16]; + uint32_t current[16]; struct x32 *u = (struct x32*)m->save; for(i = 0; i < 8; i++){ - current[2*i+0] = swap_u_int32_t(u[i].a); - current[2*i+1] = swap_u_int32_t(u[i].b); + current[2*i+0] = swap_uint32_t(u[i].a); + current[2*i+1] = swap_uint32_t(u[i].b); } calc(m, current); #else - calc(m, (u_int32_t*)m->save); + calc(m, (uint32_t*)m->save); #endif offset = 0; } diff --git a/lib/gssapi/cfx.c b/lib/gssapi/cfx.c index bd571cd85..96395a3dd 100644 --- a/lib/gssapi/cfx.c +++ b/lib/gssapi/cfx.c @@ -48,7 +48,7 @@ wrap_length_cfx(krb5_crypto crypto, size_t input_length, size_t *output_length, size_t *cksumsize, - u_int16_t *padlength) + uint16_t *padlength) { krb5_error_code ret; krb5_cksumtype type; @@ -107,7 +107,7 @@ OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status, { krb5_error_code ret; krb5_crypto crypto; - u_int16_t padlength; + uint16_t padlength; size_t output_length, cksumsize; ret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto); @@ -145,7 +145,7 @@ OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status, */ static krb5_error_code -rrc_rotate(void *data, size_t len, u_int16_t rrc, krb5_boolean unrotate) +rrc_rotate(void *data, size_t len, uint16_t rrc, krb5_boolean unrotate) { u_char *tmp, buf[256]; size_t left; @@ -199,7 +199,7 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status, unsigned usage; krb5_data cipher; size_t wrapped_len, cksumsize; - u_int16_t padlength, rrc = 0; + uint16_t padlength, rrc = 0; OM_uint32 seq_number; u_char *p; @@ -221,7 +221,7 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status, } /* Always rotate encrypted token (if any) and checksum to header */ - rrc = (conf_req_flag ? sizeof(*token) : 0) + (u_int16_t)cksumsize; + rrc = (conf_req_flag ? sizeof(*token) : 0) + (uint16_t)cksumsize; output_message_buffer->length = wrapped_len; output_message_buffer->value = malloc(output_message_buffer->length); @@ -421,7 +421,7 @@ OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status, krb5_error_code ret; unsigned usage; krb5_data data; - u_int16_t ec, rrc; + uint16_t ec, rrc; OM_uint32 seq_number_lo, seq_number_hi; size_t len; u_char *p; diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c index 28957605e..284ee54ec 100644 --- a/lib/gssapi/init_sec_context.c +++ b/lib/gssapi/init_sec_context.c @@ -187,7 +187,7 @@ init_auth krb5_creds this_cred, *cred = NULL; krb5_data outbuf; krb5_ccache ccache = NULL; - u_int32_t flags; + uint32_t flags; krb5_data authenticator; Checksum cksum; krb5_enctype enctype; diff --git a/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c index bd571cd85..96395a3dd 100644 --- a/lib/gssapi/krb5/cfx.c +++ b/lib/gssapi/krb5/cfx.c @@ -48,7 +48,7 @@ wrap_length_cfx(krb5_crypto crypto, size_t input_length, size_t *output_length, size_t *cksumsize, - u_int16_t *padlength) + uint16_t *padlength) { krb5_error_code ret; krb5_cksumtype type; @@ -107,7 +107,7 @@ OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status, { krb5_error_code ret; krb5_crypto crypto; - u_int16_t padlength; + uint16_t padlength; size_t output_length, cksumsize; ret = krb5_crypto_init(gssapi_krb5_context, key, 0, &crypto); @@ -145,7 +145,7 @@ OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status, */ static krb5_error_code -rrc_rotate(void *data, size_t len, u_int16_t rrc, krb5_boolean unrotate) +rrc_rotate(void *data, size_t len, uint16_t rrc, krb5_boolean unrotate) { u_char *tmp, buf[256]; size_t left; @@ -199,7 +199,7 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status, unsigned usage; krb5_data cipher; size_t wrapped_len, cksumsize; - u_int16_t padlength, rrc = 0; + uint16_t padlength, rrc = 0; OM_uint32 seq_number; u_char *p; @@ -221,7 +221,7 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status, } /* Always rotate encrypted token (if any) and checksum to header */ - rrc = (conf_req_flag ? sizeof(*token) : 0) + (u_int16_t)cksumsize; + rrc = (conf_req_flag ? sizeof(*token) : 0) + (uint16_t)cksumsize; output_message_buffer->length = wrapped_len; output_message_buffer->value = malloc(output_message_buffer->length); @@ -421,7 +421,7 @@ OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status, krb5_error_code ret; unsigned usage; krb5_data data; - u_int16_t ec, rrc; + uint16_t ec, rrc; OM_uint32 seq_number_lo, seq_number_hi; size_t len; u_char *p; diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c index 28957605e..284ee54ec 100644 --- a/lib/gssapi/krb5/init_sec_context.c +++ b/lib/gssapi/krb5/init_sec_context.c @@ -187,7 +187,7 @@ init_auth krb5_creds this_cred, *cred = NULL; krb5_data outbuf; krb5_ccache ccache = NULL; - u_int32_t flags; + uint32_t flags; krb5_data authenticator; Checksum cksum; krb5_enctype enctype; diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c index 0632aca8d..e14727b73 100644 --- a/lib/gssapi/krb5/wrap.c +++ b/lib/gssapi/krb5/wrap.c @@ -286,7 +286,7 @@ wrap_des3 u_char seq[8]; int32_t seq_number; size_t len, total_len, padlength, datalen; - u_int32_t ret; + uint32_t ret; krb5_crypto crypto; Checksum cksum; krb5_data encdata; diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c index 0632aca8d..e14727b73 100644 --- a/lib/gssapi/wrap.c +++ b/lib/gssapi/wrap.c @@ -286,7 +286,7 @@ wrap_des3 u_char seq[8]; int32_t seq_number; size_t len, total_len, padlength, datalen; - u_int32_t ret; + uint32_t ret; krb5_crypto crypto; Checksum cksum; krb5_data encdata; diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c index 09cf21678..3efc7a874 100644 --- a/lib/hdb/mkey.c +++ b/lib/hdb/mkey.c @@ -355,7 +355,7 @@ hdb_write_master_key(krb5_context context, const char *filename, } hdb_master_key -_hdb_find_master_key(u_int32_t *mkvno, hdb_master_key mkey) +_hdb_find_master_key(uint32_t *mkvno, hdb_master_key mkey) { hdb_master_key ret = NULL; while(mkey) { diff --git a/lib/hx509/name.c b/lib/hx509/name.c index 0e188ce59..91a52602c 100644 --- a/lib/hx509/name.c +++ b/lib/hx509/name.c @@ -176,7 +176,7 @@ hx509_name_to_string(const hx509_name name, char **str) ss = ds->u.ia5String; break; case choice_DirectoryString_bmpString: { - u_int16_t *bmp = ds->u.bmpString.data; + uint16_t *bmp = ds->u.bmpString.data; size_t len = ds->u.bmpString.length; int k; diff --git a/lib/kadm5/acl.c b/lib/kadm5/acl.c index f691f98ef..9f81829ef 100644 --- a/lib/kadm5/acl.c +++ b/lib/kadm5/acl.c @@ -48,7 +48,7 @@ static struct units acl_units[] = { }; kadm5_ret_t -_kadm5_string_to_privs(const char *s, u_int32_t* privs) +_kadm5_string_to_privs(const char *s, uint32_t* privs) { int flags; flags = parse_flags(s, acl_units, 0); @@ -59,7 +59,7 @@ _kadm5_string_to_privs(const char *s, u_int32_t* privs) } kadm5_ret_t -_kadm5_privs_to_string(u_int32_t privs, char *string, size_t len) +_kadm5_privs_to_string(uint32_t privs, char *string, size_t len) { if(privs == 0) strlcpy(string, "none", len); diff --git a/lib/kadm5/ad.c b/lib/kadm5/ad.c index cfc2c61dc..117417534 100644 --- a/lib/kadm5/ad.c +++ b/lib/kadm5/ad.c @@ -561,7 +561,7 @@ get_fqdn(krb5_context context, const krb5_principal p) static kadm5_ret_t kadm5_ad_create_principal(void *server_handle, kadm5_principal_ent_t entry, - u_int32_t mask, + uint32_t mask, const char *password) { kadm5_ad_context *context = server_handle; @@ -877,7 +877,7 @@ static kadm5_ret_t kadm5_ad_get_principal(void *server_handle, krb5_principal principal, kadm5_principal_ent_t entry, - u_int32_t mask) + uint32_t mask) { kadm5_ad_context *context = server_handle; #ifdef OPENLDAP @@ -982,7 +982,7 @@ kadm5_ad_get_principal(void *server_handle, if (mask & KADM5_ATTRIBUTES) { vals = ldap_get_values(CTX2LP(context), m0, "userAccountControl"); if (vals) { - u_int32_t i; + uint32_t i; i = atoi(vals[0]); if (i & (UF_ACCOUNTDISABLE|UF_LOCKOUT)) entry->attributes |= KRB5_KDB_DISALLOW_ALL_TIX; @@ -1051,7 +1051,7 @@ kadm5_ad_get_principals(void *server_handle, } static kadm5_ret_t -kadm5_ad_get_privs(void *server_handle, u_int32_t*privs) +kadm5_ad_get_privs(void *server_handle, uint32_t*privs) { kadm5_ad_context *context = server_handle; krb5_set_error_string(context->context, "Function not implemented"); @@ -1061,7 +1061,7 @@ kadm5_ad_get_privs(void *server_handle, u_int32_t*privs) static kadm5_ret_t kadm5_ad_modify_principal(void *server_handle, kadm5_principal_ent_t entry, - u_int32_t mask) + uint32_t mask) { kadm5_ad_context *context = server_handle; diff --git a/lib/kadm5/common_glue.c b/lib/kadm5/common_glue.c index 436071622..d345cdc92 100644 --- a/lib/kadm5/common_glue.c +++ b/lib/kadm5/common_glue.c @@ -58,7 +58,7 @@ kadm5_chpass_principal_with_key(void *server_handle, kadm5_ret_t kadm5_create_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask, + uint32_t mask, const char *password) { return __CALL(create_principal, (server_handle, princ, mask, password)); @@ -87,7 +87,7 @@ kadm5_ret_t kadm5_get_principal(void *server_handle, krb5_principal princ, kadm5_principal_ent_t out, - u_int32_t mask) + uint32_t mask) { return __CALL(get_principal, (server_handle, princ, out, mask)); } @@ -95,7 +95,7 @@ kadm5_get_principal(void *server_handle, kadm5_ret_t kadm5_modify_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { return __CALL(modify_principal, (server_handle, princ, mask)); } @@ -128,7 +128,7 @@ kadm5_get_principals(void *server_handle, kadm5_ret_t kadm5_get_privs(void *server_handle, - u_int32_t *privs) + uint32_t *privs) { return __CALL(get_privs, (server_handle, privs)); } diff --git a/lib/kadm5/create_c.c b/lib/kadm5/create_c.c index 7c47634a7..0cf6def81 100644 --- a/lib/kadm5/create_c.c +++ b/lib/kadm5/create_c.c @@ -38,7 +38,7 @@ RCSID("$Id$"); kadm5_ret_t kadm5_c_create_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask, + uint32_t mask, const char *password) { kadm5_client_context *context = server_handle; diff --git a/lib/kadm5/create_s.c b/lib/kadm5/create_s.c index b30d1921c..7acbe8773 100644 --- a/lib/kadm5/create_s.c +++ b/lib/kadm5/create_s.c @@ -56,14 +56,14 @@ get_default(kadm5_server_context *context, krb5_principal princ, static kadm5_ret_t create_principal(kadm5_server_context *context, kadm5_principal_ent_t princ, - u_int32_t mask, + uint32_t mask, hdb_entry_ex *ent, - u_int32_t required_mask, - u_int32_t forbidden_mask) + uint32_t required_mask, + uint32_t forbidden_mask) { kadm5_ret_t ret; kadm5_principal_ent_rec defrec, *defent; - u_int32_t def_mask; + uint32_t def_mask; if((mask & required_mask) != required_mask) return KADM5_BAD_MASK; @@ -104,7 +104,7 @@ create_principal(kadm5_server_context *context, kadm5_ret_t kadm5_s_create_principal_with_key(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { kadm5_ret_t ret; hdb_entry_ex ent; @@ -143,7 +143,7 @@ out: kadm5_ret_t kadm5_s_create_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask, + uint32_t mask, const char *password) { kadm5_ret_t ret; diff --git a/lib/kadm5/ent_setup.c b/lib/kadm5/ent_setup.c index 0e99b3dbf..100d03410 100644 --- a/lib/kadm5/ent_setup.c +++ b/lib/kadm5/ent_setup.c @@ -116,11 +116,11 @@ perform_tl_data(krb5_context context, kadm5_ret_t _kadm5_setup_entry(kadm5_server_context *context, hdb_entry_ex *ent, - u_int32_t mask, + uint32_t mask, kadm5_principal_ent_t princ, - u_int32_t princ_mask, + uint32_t princ_mask, kadm5_principal_ent_t def, - u_int32_t def_mask) + uint32_t def_mask) { if(mask & KADM5_PRINC_EXPIRE_TIME && princ_mask & KADM5_PRINC_EXPIRE_TIME) { diff --git a/lib/kadm5/get_c.c b/lib/kadm5/get_c.c index 7d21809cb..051c1d8b3 100644 --- a/lib/kadm5/get_c.c +++ b/lib/kadm5/get_c.c @@ -39,7 +39,7 @@ kadm5_ret_t kadm5_c_get_principal(void *server_handle, krb5_principal princ, kadm5_principal_ent_t out, - u_int32_t mask) + uint32_t mask) { kadm5_client_context *context = server_handle; kadm5_ret_t ret; diff --git a/lib/kadm5/get_s.c b/lib/kadm5/get_s.c index cfc5a317c..68c4f3faf 100644 --- a/lib/kadm5/get_s.c +++ b/lib/kadm5/get_s.c @@ -68,7 +68,7 @@ kadm5_ret_t kadm5_s_get_principal(void *server_handle, krb5_principal princ, kadm5_principal_ent_t out, - u_int32_t mask) + uint32_t mask) { kadm5_server_context *context = server_handle; kadm5_ret_t ret; diff --git a/lib/kadm5/iprop-log.c b/lib/kadm5/iprop-log.c index 04de8f282..fe9d914f1 100644 --- a/lib/kadm5/iprop-log.c +++ b/lib/kadm5/iprop-log.c @@ -98,10 +98,10 @@ static const char *op_names[] = { static void print_entry(kadm5_server_context *server_context, - u_int32_t ver, + uint32_t ver, time_t timestamp, enum kadm_ops op, - u_int32_t len, + uint32_t len, krb5_storage *sp, void *ctx) { @@ -308,10 +308,10 @@ int end_version = -1; static void apply_entry(kadm5_server_context *server_context, - u_int32_t ver, + uint32_t ver, time_t timestamp, enum kadm_ops op, - u_int32_t len, + uint32_t len, krb5_storage *sp, void *ctx) { diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index 2824f6c62..ad3a8f300 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -106,7 +106,7 @@ struct slave { struct sockaddr_in addr; char *name; krb5_auth_context ac; - u_int32_t version; + uint32_t version; time_t seen; unsigned long flags; #define SLAVE_F_DEAD 0x1 @@ -310,7 +310,7 @@ prop_one (krb5_context context, HDB *db, hdb_entry_ex *entry, void *v) static int send_complete (krb5_context context, slave *s, - const char *database, u_int32_t current_version) + const char *database, uint32_t current_version) { krb5_error_code ret; krb5_storage *sp; @@ -413,13 +413,13 @@ send_are_you_there (krb5_context context, slave *s) static int send_diffs (krb5_context context, slave *s, int log_fd, - const char *database, u_int32_t current_version) + const char *database, uint32_t current_version) { krb5_storage *sp; - u_int32_t ver; + uint32_t ver; time_t timestamp; enum kadm_ops op; - u_int32_t len; + uint32_t len; off_t right, left; krb5_data data; int ret = 0; @@ -478,7 +478,7 @@ send_diffs (krb5_context context, slave *s, int log_fd, static int process_msg (krb5_context context, slave *s, int log_fd, - const char *database, u_int32_t current_version) + const char *database, uint32_t current_version) { int ret = 0; krb5_data out; @@ -535,7 +535,7 @@ process_msg (krb5_context context, slave *s, int log_fd, #define SLAVE_SEEN "Last Seen" static void -write_stats(krb5_context context, slave *slaves, u_int32_t current_version) +write_stats(krb5_context context, slave *slaves, uint32_t current_version) { char str[100]; rtbl_t tbl; @@ -641,7 +641,7 @@ main(int argc, char **argv) int signal_fd, listen_fd; int log_fd; slave *slaves = NULL; - u_int32_t current_version = 0, old_version = 0; + uint32_t current_version = 0, old_version = 0; krb5_keytab keytab; int optidx; char **files; @@ -719,7 +719,7 @@ main(int argc, char **argv) fd_set readset; int max_fd = 0; struct timeval to = {30, 0}; - u_int32_t vers; + uint32_t vers; if (signal_fd >= FD_SETSIZE || listen_fd >= FD_SETSIZE) krb5_errx (context, 1, "fd too large"); diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c index 038e5479e..5cd12452d 100644 --- a/lib/kadm5/ipropd_slave.c +++ b/lib/kadm5/ipropd_slave.c @@ -133,7 +133,7 @@ get_creds(krb5_context context, const char *keytab_str, static void ihave (krb5_context context, krb5_auth_context auth_context, - int fd, u_int32_t version) + int fd, uint32_t version) { int ret; u_char buf[8]; diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c index 6a069e8f0..00977c1ed 100644 --- a/lib/kadm5/log.c +++ b/lib/kadm5/log.c @@ -50,7 +50,7 @@ RCSID("$Id$"); kadm5_ret_t kadm5_log_get_version_fd (int fd, - u_int32_t *ver) + uint32_t *ver) { int ret; krb5_storage *sp; @@ -73,13 +73,13 @@ kadm5_log_get_version_fd (int fd, } kadm5_ret_t -kadm5_log_get_version (kadm5_server_context *context, u_int32_t *ver) +kadm5_log_get_version (kadm5_server_context *context, uint32_t *ver) { return kadm5_log_get_version_fd (context->log_context.log_fd, ver); } kadm5_ret_t -kadm5_log_set_version (kadm5_server_context *context, u_int32_t vno) +kadm5_log_set_version (kadm5_server_context *context, uint32_t vno) { kadm5_log_context *log_context = &context->log_context; @@ -265,8 +265,8 @@ kadm5_log_create (kadm5_server_context *context, kadm5_ret_t kadm5_log_replay_create (kadm5_server_context *context, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { krb5_error_code ret; @@ -342,8 +342,8 @@ out: kadm5_ret_t kadm5_log_replay_delete (kadm5_server_context *context, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { krb5_error_code ret; @@ -428,8 +428,8 @@ failed: kadm5_ret_t kadm5_log_replay_rename (kadm5_server_context *context, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { krb5_error_code ret; @@ -477,12 +477,12 @@ kadm5_log_replay_rename (kadm5_server_context *context, kadm5_ret_t kadm5_log_modify (kadm5_server_context *context, hdb_entry *ent, - u_int32_t mask) + uint32_t mask) { krb5_storage *sp; kadm5_ret_t ret; krb5_data value; - u_int32_t len; + uint32_t len; kadm5_log_context *log_context = &context->log_context; krb5_data_zero(&value); @@ -529,8 +529,8 @@ failed: kadm5_ret_t kadm5_log_replay_modify (kadm5_server_context *context, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { krb5_error_code ret; @@ -741,8 +741,8 @@ kadm5_log_nop (kadm5_server_context *context) kadm5_ret_t kadm5_log_replay_nop (kadm5_server_context *context, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { return 0; @@ -755,10 +755,10 @@ kadm5_log_replay_nop (kadm5_server_context *context, kadm5_ret_t kadm5_log_foreach (kadm5_server_context *context, void (*func)(kadm5_server_context *server_context, - u_int32_t ver, + uint32_t ver, time_t timestamp, enum kadm_ops op, - u_int32_t len, + uint32_t len, krb5_storage *, void *), void *ctx) @@ -803,10 +803,10 @@ kadm5_log_goto_end (int fd) kadm5_ret_t kadm5_log_previous (krb5_context context, krb5_storage *sp, - u_int32_t *ver, + uint32_t *ver, time_t *timestamp, enum kadm_ops *op, - u_int32_t *len) + uint32_t *len) { krb5_error_code ret; off_t off; @@ -858,8 +858,8 @@ kadm5_log_previous (krb5_context context, kadm5_ret_t kadm5_log_replay (kadm5_server_context *context, enum kadm_ops op, - u_int32_t ver, - u_int32_t len, + uint32_t ver, + uint32_t len, krb5_storage *sp) { switch (op) { @@ -886,7 +886,7 @@ kadm5_ret_t kadm5_log_truncate (kadm5_server_context *server_context) { kadm5_ret_t ret; - u_int32_t vno; + uint32_t vno; ret = kadm5_log_init (server_context); if (ret) diff --git a/lib/kadm5/marshall.c b/lib/kadm5/marshall.c index df9675f2b..4d94f1463 100644 --- a/lib/kadm5/marshall.c +++ b/lib/kadm5/marshall.c @@ -105,7 +105,7 @@ kadm5_ret_tl_data(krb5_storage *sp, static kadm5_ret_t store_principal_ent(krb5_storage *sp, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { int i; @@ -173,7 +173,7 @@ kadm5_store_principal_ent(krb5_storage *sp, kadm5_ret_t kadm5_store_principal_ent_mask(krb5_storage *sp, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { krb5_store_int32(sp, mask); return store_principal_ent (sp, princ, mask); @@ -182,7 +182,7 @@ kadm5_store_principal_ent_mask(krb5_storage *sp, static kadm5_ret_t ret_principal_ent(krb5_storage *sp, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { int i; int32_t tmp; @@ -287,7 +287,7 @@ kadm5_ret_principal_ent(krb5_storage *sp, kadm5_ret_t kadm5_ret_principal_ent_mask(krb5_storage *sp, kadm5_principal_ent_t princ, - u_int32_t *mask) + uint32_t *mask) { int32_t tmp; diff --git a/lib/kadm5/modify_c.c b/lib/kadm5/modify_c.c index 82fad3d60..53c6a7d98 100644 --- a/lib/kadm5/modify_c.c +++ b/lib/kadm5/modify_c.c @@ -38,7 +38,7 @@ RCSID("$Id$"); kadm5_ret_t kadm5_c_modify_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { kadm5_client_context *context = server_handle; kadm5_ret_t ret; diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c index 17b38fa66..3c37a3cc7 100644 --- a/lib/kadm5/modify_s.c +++ b/lib/kadm5/modify_s.c @@ -38,8 +38,8 @@ RCSID("$Id$"); static kadm5_ret_t modify_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask, - u_int32_t forbidden_mask) + uint32_t mask, + uint32_t forbidden_mask) { kadm5_server_context *context = server_handle; hdb_entry_ex ent; @@ -85,7 +85,7 @@ out: kadm5_ret_t kadm5_s_modify_principal(void *server_handle, kadm5_principal_ent_t princ, - u_int32_t mask) + uint32_t mask) { return modify_principal(server_handle, princ, mask, KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME diff --git a/lib/kadm5/password_quality.c b/lib/kadm5/password_quality.c index 2fe9182cc..917166251 100644 --- a/lib/kadm5/password_quality.c +++ b/lib/kadm5/password_quality.c @@ -51,10 +51,10 @@ min_length_passwd_quality (krb5_context context, char *message, size_t length) { - u_int32_t min_length = krb5_config_get_int_default(context, NULL, 6, - "password_quality", - "min_length", - NULL); + uint32_t min_length = krb5_config_get_int_default(context, NULL, 6, + "password_quality", + "min_length", + NULL); if (pwd->length < min_length) { strlcpy(message, "Password too short", length); diff --git a/lib/kadm5/privs_c.c b/lib/kadm5/privs_c.c index 1b17a2ca2..ed393707f 100644 --- a/lib/kadm5/privs_c.c +++ b/lib/kadm5/privs_c.c @@ -36,7 +36,7 @@ RCSID("$Id$"); kadm5_ret_t -kadm5_c_get_privs(void *server_handle, u_int32_t *privs) +kadm5_c_get_privs(void *server_handle, uint32_t *privs) { kadm5_client_context *context = server_handle; kadm5_ret_t ret; diff --git a/lib/kadm5/privs_s.c b/lib/kadm5/privs_s.c index 5edf29e3b..b293642c3 100644 --- a/lib/kadm5/privs_s.c +++ b/lib/kadm5/privs_s.c @@ -36,7 +36,7 @@ RCSID("$Id$"); kadm5_ret_t -kadm5_s_get_privs(void *server_handle, u_int32_t *privs) +kadm5_s_get_privs(void *server_handle, uint32_t *privs) { kadm5_server_context *context = server_handle; *privs = context->acl_flags;