diff options
| author |  Karl Ramm <kcr@1ts.org> | 2009-04-21 15:04:33 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2009-04-21 15:04:33 +0000 |
| commit | 65985154f1dc200dec5738a6092c6d3247a3744b (patch) | |
| tree | 8cf39b573a2c86f409b9d68c951acac61adcb2e0 /server/subscr.c | |
| parent | 8a75a336df6609a4d0a7650e4a0e7b1f13e9ed7c (diff) | |
use less oddball types
Diffstat (limited to 'server/subscr.c')
| -rw-r--r-- | server/subscr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/subscr.c b/server/subscr.c index 201721b..0516647 100644 --- a/server/subscr.c +++ b/server/subscr.c @@ -811,7 +811,7 @@ subscr_send_subs(Client *client) return errno; } *(krb5_enctype *)&bufp[0] = htonl(Z_enctype(client->session_keyblock)); - *(u_int32_t *)&bufp[4] = htonl(Z_keylen(client->session_keyblock)); + *(uint32_t *)&bufp[4] = htonl(Z_keylen(client->session_keyblock)); memcpy(&bufp[8], Z_keydata(client->session_keyblock), Z_keylen(client->session_keyblock)); retval = ZMakeZcode(buf, sizeof(buf), bufp, Z_keylen(client->session_keyblock) + 8); @@ -1010,7 +1010,7 @@ subscr_realm_sendit(Client *who, /* convert the address to a string of the form x.x.x.x/port */ strcpy(addr, inet_ntoa(who->addr.sin_addr)); if ((retval = ZMakeAscii(port, sizeof(port), (unsigned char *) - &who->addr.sin_port, sizeof(u_short))) != ZERR_NONE) + &who->addr.sin_port, sizeof(unsigned short))) != ZERR_NONE) { syslog(LOG_ERR, "subscr_rlm_sendit make ascii: %s", error_message(retval)); @@ -1285,7 +1285,7 @@ subscr_realm_subs(ZRealm *realm) num = 0; if ((retval = ZMakeAscii(port, sizeof(port), (unsigned char *) - &num, sizeof(u_short))) != ZERR_NONE) + &num, sizeof(unsigned short))) != ZERR_NONE) { syslog(LOG_ERR, "subscr_rlm_sendit make ascii: %s", error_message(retval)); @@ -1499,7 +1499,8 @@ Code_t subscr_foreign_user(ZNotice_t *notice, snotice = *notice; - if ((status = ZReadAscii(cp, strlen(cp), (unsigned char *)&snotice.z_port, sizeof(u_short))) + if ((status = ZReadAscii(cp, strlen(cp), (unsigned char *)&snotice.z_port, + sizeof(unsigned short))) != ZERR_NONE) { syslog(LOG_ERR, "subscr_foreign_user read ascii: %s", |