From 3b80f410e0e0c85b1201271d8e85b4072b8e60b4 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 11 May 2001 03:42:35 +0000 Subject: [PATCH] * defines.h: Fix k4cmd prototype to match kcmd.c * kcmd.c (k4cmd): Fix to not use a narrow type. * krlogin.c: Fix prototypes so they don't include narrow types. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13240 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 8 ++++++++ src/appl/bsd/defines.h | 3 ++- src/appl/bsd/kcmd.c | 2 +- src/appl/bsd/krlogin.c | 5 +++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index c2ae0f4da..fcd4bd462 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,11 @@ +2001-05-10 Tom Yu + + * defines.h: Fix k4cmd prototype to match kcmd.c. + + * kcmd.c (k4cmd): Fix to not use a narrow type. + + * krlogin.c: Fix prototypes so they don't include narrow types. + 2001-04-26 Ken Raeburn * configure.in: Don't use KRB5_CHECK_PROTOS. diff --git a/src/appl/bsd/defines.h b/src/appl/bsd/defines.h index 94b880f3d..4259f1398 100644 --- a/src/appl/bsd/defines.h +++ b/src/appl/bsd/defines.h @@ -47,7 +47,8 @@ extern void rcmd_stream_init_normal(void); #if defined(KRB5_KRB4_COMPAT) && !defined(SKIP_V4_PROTO) extern void rcmd_stream_init_krb4(C_Block, int, int, int); -extern int k4cmd(int *sock, char **ahost, u_short rport, char *locuser, +extern int k4cmd(int *sock, char **ahost, unsigned int rport, + char *locuser, char *remuser, char *cmd, int *fd2p, KTEXT ticket, char *service, char *realm, CREDENTIALS *cred, Key_schedule schedule, MSG_DAT *msg_data, diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c index 0a8e6128f..353c611b5 100644 --- a/src/appl/bsd/kcmd.c +++ b/src/appl/bsd/kcmd.c @@ -527,7 +527,7 @@ k4cmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, ticket, service, realm, cred, schedule, msg_data, laddr, faddr, authopts, anyport) int *sock; char **ahost; - u_short rport; + unsigned int rport; char *locuser, *remuser, *cmd; int *fd2p; KTEXT ticket; diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c index 722163987..3c96507c8 100644 --- a/src/appl/bsd/krlogin.c +++ b/src/appl/bsd/krlogin.c @@ -276,7 +276,7 @@ static void doit(int); #endif static int control(unsigned char *, int); static void sendwindow(void); -static void stop(char), echo(char); +static void stop(int), echo(int); static void writer(void), done(int); static int confirm_death (void); @@ -974,7 +974,8 @@ setsignal(sig, act) -void done(status) +static void +done(status) int status; { #ifdef POSIX_SIGNALS -- 2.26.2