rusers: modernize a bit

This commit is contained in:
Eitan Adler 2018-06-25 11:44:56 +00:00
parent 7f08b09a0e
commit b1ba4c4472

View File

@ -94,9 +94,9 @@ remember_host(struct in_addr addr)
} }
static int static int
rusers_reply(caddr_t replyp, struct sockaddr_in *raddrp) rusers_reply(void *replyp, struct sockaddr_in *raddrp)
{ {
u_int x; unsigned int x;
int idle; int idle;
char date[32], idle_time[64], remote[64]; char date[32], idle_time[64], remote[64];
struct hostent *hp; struct hostent *hp;
@ -190,14 +190,14 @@ onehost(char *host)
if (rusers_clnt == NULL) if (rusers_clnt == NULL)
errx(1, "%s", clnt_spcreateerror("")); errx(1, "%s", clnt_spcreateerror(""));
bzero((char *)&up, sizeof(up)); memset(&up, 0, sizeof(up));
tv.tv_sec = 15; /* XXX ?? */ tv.tv_sec = 15; /* XXX ?? */
tv.tv_usec = 0; tv.tv_usec = 0;
if (clnt_call(rusers_clnt, RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL, if (clnt_call(rusers_clnt, RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
(xdrproc_t)xdr_utmpidlearr, &up, tv) != RPC_SUCCESS) (xdrproc_t)xdr_utmpidlearr, &up, tv) != RPC_SUCCESS)
errx(1, "%s", clnt_sperror(rusers_clnt, "")); errx(1, "%s", clnt_sperror(rusers_clnt, ""));
memcpy(&addr.sin_addr.s_addr, hp->h_addr, sizeof(addr.sin_addr.s_addr)); memcpy(&addr.sin_addr.s_addr, hp->h_addr, sizeof(addr.sin_addr.s_addr));
rusers_reply((caddr_t)&up, &addr); rusers_reply(&up, &addr);
clnt_destroy(rusers_clnt); clnt_destroy(rusers_clnt);
} }
@ -207,7 +207,7 @@ allhosts(void)
utmpidlearr up; utmpidlearr up;
enum clnt_stat clnt_stat; enum clnt_stat clnt_stat;
bzero((char *)&up, sizeof(up)); memset(&up, 0, sizeof(up));
clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE, clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE,
RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL, RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
(xdrproc_t)xdr_utmpidlearr, (char *)&up, (xdrproc_t)xdr_utmpidlearr, (char *)&up,