Rename u_intXX_t to uintXX_t
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17450 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -121,7 +121,7 @@ krb4_adat(void *app_data, void *buf, size_t len)
|
||||
AUTH_DAT auth_dat;
|
||||
char *p;
|
||||
int kerror;
|
||||
u_int32_t cs;
|
||||
uint32_t cs;
|
||||
char msg[35]; /* size of encrypted block */
|
||||
int tmp_len;
|
||||
struct krb4_data *d = app_data;
|
||||
@@ -240,7 +240,7 @@ krb4_auth(void *app_data, char *host)
|
||||
KTEXT_ST adat;
|
||||
MSG_DAT msg_data;
|
||||
int checksum;
|
||||
u_int32_t cs;
|
||||
uint32_t cs;
|
||||
struct krb4_data *d = app_data;
|
||||
struct sockaddr_in *localaddr = (struct sockaddr_in *)LOCAL_ADDR;
|
||||
struct sockaddr_in *remoteaddr = (struct sockaddr_in *)REMOTE_ADDR;
|
||||
|
@@ -37,7 +37,7 @@ RCSID("$Id$");
|
||||
|
||||
char x_socket[MaxPathLen];
|
||||
|
||||
u_int32_t display_num;
|
||||
uint32_t display_num;
|
||||
char display[MaxPathLen];
|
||||
int display_size = sizeof(display);
|
||||
char xauthfile[MaxPathLen];
|
||||
@@ -782,7 +782,7 @@ suspicious_address (int sock, struct sockaddr *addr)
|
||||
#ifndef KRB4
|
||||
|
||||
int
|
||||
krb_get_int(void *f, u_int32_t *to, int size, int lsb)
|
||||
krb_get_int(void *f, uint32_t *to, int size, int lsb)
|
||||
{
|
||||
int i;
|
||||
unsigned char *from = (unsigned char *)f;
|
||||
@@ -799,7 +799,7 @@ krb_get_int(void *f, u_int32_t *to, int size, int lsb)
|
||||
}
|
||||
|
||||
int
|
||||
krb_put_int(u_int32_t from, void *to, size_t rem, int size)
|
||||
krb_put_int(uint32_t from, void *to, size_t rem, int size)
|
||||
{
|
||||
int i;
|
||||
unsigned char *p = (unsigned char *)to;
|
||||
|
@@ -352,7 +352,7 @@ krb5_make_context (kx_context *kc)
|
||||
int
|
||||
recv_v5_auth (kx_context *kc, int sock, u_char *buf)
|
||||
{
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
krb5_error_code ret;
|
||||
krb5_principal server;
|
||||
krb5_auth_context auth_context = NULL;
|
||||
|
@@ -208,7 +208,7 @@ doit_passive (kx_context *kc)
|
||||
int otherside;
|
||||
u_char msg[1024], *p;
|
||||
int len;
|
||||
u_int32_t tmp;
|
||||
uint32_t tmp;
|
||||
const char *host = kc->host;
|
||||
|
||||
otherside = connect_host (kc);
|
||||
@@ -352,7 +352,7 @@ doit_active (kx_context *kc)
|
||||
char *str;
|
||||
int i;
|
||||
size_t rem;
|
||||
u_int32_t other_port;
|
||||
uint32_t other_port;
|
||||
int error;
|
||||
const char *host = kc->host;
|
||||
|
||||
@@ -417,7 +417,7 @@ doit_active (kx_context *kc)
|
||||
err (1, "read from %s", host);
|
||||
p = (u_char *)msg;
|
||||
if (*p == ERROR) {
|
||||
u_int32_t u32;
|
||||
uint32_t u32;
|
||||
|
||||
p++;
|
||||
p += krb_get_int (p, &u32, 4, 0);
|
||||
@@ -478,7 +478,7 @@ doit_active (kx_context *kc)
|
||||
err (1, "read from %s", host);
|
||||
p = (u_char *)msg;
|
||||
if (*p == ERROR) {
|
||||
u_int32_t val;
|
||||
uint32_t val;
|
||||
|
||||
p++;
|
||||
p += krb_get_int (p, &val, 4, 0);
|
||||
|
@@ -147,7 +147,7 @@ struct x_socket {
|
||||
};
|
||||
|
||||
extern char x_socket[];
|
||||
extern u_int32_t display_num;
|
||||
extern uint32_t display_num;
|
||||
extern char display[];
|
||||
extern int display_size;
|
||||
extern char xauthfile[];
|
||||
@@ -259,9 +259,9 @@ __attribute__ ((format (printf, 3, 4)))
|
||||
#ifndef KRB4
|
||||
|
||||
int
|
||||
krb_get_int(void *f, u_int32_t *to, int size, int lsb);
|
||||
krb_get_int(void *f, uint32_t *to, int size, int lsb);
|
||||
|
||||
int
|
||||
krb_put_int(u_int32_t from, void *to, size_t rem, int size);
|
||||
krb_put_int(uint32_t from, void *to, size_t rem, int size);
|
||||
|
||||
#endif
|
||||
|
@@ -119,7 +119,7 @@ recv_conn (int sock, kx_context *kc,
|
||||
int ret = 1;
|
||||
int flags;
|
||||
int len;
|
||||
u_int32_t tmp32;
|
||||
uint32_t tmp32;
|
||||
|
||||
memset(kc, 0, sizeof(*kc));
|
||||
*nsockets = 0;
|
||||
|
@@ -43,7 +43,7 @@ RCSID("$Id$");
|
||||
|
||||
struct krb4_state {
|
||||
int stage;
|
||||
u_int32_t nonce;
|
||||
uint32_t nonce;
|
||||
};
|
||||
|
||||
static int
|
||||
@@ -128,7 +128,7 @@ krb4_loop(POP *p, void *state,
|
||||
}
|
||||
|
||||
if(ks->stage == 2) {
|
||||
u_int32_t nonce_reply;
|
||||
uint32_t nonce_reply;
|
||||
/* C -> S: nonce | bit | max segment | username */
|
||||
|
||||
if (input_length % 8 != 0) {
|
||||
|
@@ -103,7 +103,7 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
krb5_auth_context auth_context = NULL;
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
krb5_ticket *ticket;
|
||||
char *server;
|
||||
|
||||
|
@@ -82,7 +82,7 @@ do_read (int fd, void *buf, size_t sz, void *ivec)
|
||||
#ifdef KRB5
|
||||
if(auth_method == AUTH_KRB5) {
|
||||
krb5_error_code ret;
|
||||
u_int32_t len, outer_len;
|
||||
uint32_t len, outer_len;
|
||||
int status;
|
||||
krb5_data data;
|
||||
void *edata;
|
||||
|
@@ -314,7 +314,7 @@ recv_krb5_auth (int s, u_char *buf,
|
||||
char **server_username,
|
||||
char **cmd)
|
||||
{
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
krb5_auth_context auth_context = NULL;
|
||||
krb5_ticket *ticket;
|
||||
krb5_error_code status;
|
||||
|
@@ -652,7 +652,7 @@ static int
|
||||
unpack_cred(unsigned char *buf, int len, CREDENTIALS *cred)
|
||||
{
|
||||
char *p = (char*)buf;
|
||||
u_int32_t tmp;
|
||||
uint32_t tmp;
|
||||
|
||||
strncpy (cred->service, p, ANAME_SZ);
|
||||
cred->service[ANAME_SZ - 1] = '\0';
|
||||
@@ -676,7 +676,7 @@ unpack_cred(unsigned char *buf, int len, CREDENTIALS *cred)
|
||||
p += cred->ticket_st.length;
|
||||
p += krb_get_int(p, &tmp, 4, 0);
|
||||
cred->ticket_st.mbz = 0;
|
||||
p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, 0);
|
||||
p += krb_get_int(p, (uint32_t *)&cred->issue_date, 4, 0);
|
||||
|
||||
strncpy (cred->pname, p, ANAME_SZ);
|
||||
cred->pname[ANAME_SZ - 1] = '\0';
|
||||
|
@@ -39,7 +39,7 @@ RCSID("$Id$");
|
||||
void
|
||||
write_token (int sock, gss_buffer_t buf)
|
||||
{
|
||||
u_int32_t len, net_len;
|
||||
uint32_t len, net_len;
|
||||
OM_uint32 min_stat;
|
||||
|
||||
len = buf->length;
|
||||
@@ -69,7 +69,7 @@ enet_read(int fd, void *buf, size_t len)
|
||||
void
|
||||
read_token (int sock, gss_buffer_t buf)
|
||||
{
|
||||
u_int32_t len, net_len;
|
||||
uint32_t len, net_len;
|
||||
|
||||
enet_read (sock, &net_len, 4);
|
||||
len = ntohl(net_len);
|
||||
|
@@ -51,7 +51,7 @@ void
|
||||
nt_write_token (int sock, gss_buffer_t buf)
|
||||
{
|
||||
unsigned char net_len[4];
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
OM_uint32 min_stat;
|
||||
|
||||
len = buf->length;
|
||||
@@ -77,7 +77,7 @@ void
|
||||
nt_read_token (int sock, gss_buffer_t buf)
|
||||
{
|
||||
unsigned char net_len[4];
|
||||
u_int32_t len;
|
||||
uint32_t len;
|
||||
|
||||
if (read(sock, net_len, 4) != 4)
|
||||
err (1, "read");
|
||||
|
@@ -44,7 +44,7 @@ proto (int sock, const char *hostname, const char *service)
|
||||
krb5_principal server;
|
||||
krb5_data data;
|
||||
krb5_data packet;
|
||||
u_int32_t len, net_len;
|
||||
uint32_t len, net_len;
|
||||
|
||||
status = krb5_auth_con_init (context, &auth_context);
|
||||
if (status)
|
||||
|
@@ -47,7 +47,7 @@ proto (int sock, const char *service)
|
||||
char hostname[MAXHOSTNAMELEN];
|
||||
krb5_data packet;
|
||||
krb5_data data;
|
||||
u_int32_t len, net_len;
|
||||
uint32_t len, net_len;
|
||||
ssize_t n;
|
||||
|
||||
status = krb5_auth_con_init (context, &auth_context);
|
||||
|
Reference in New Issue
Block a user