-Wall type correctness

diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 4470cd8..606b458 100644 (file)
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)rshd.c    8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$Id: rshd.c,v 1.30 2000/01/27 05:21:12 itojun Exp $";
+static char *rcsid = "$Id: rshd.c,v 1.31 2000/03/09 14:59:12 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -446,6 +446,7 @@ doit(fromp)
 #ifdef CRYPT
                if (doencrypt) {
                        struct sockaddr_in local_addr;
+
                        rc = sizeof(local_addr);
                        if (getsockname(0, (struct sockaddr *)&local_addr,
                            &rc) < 0) {
@@ -455,17 +456,14 @@ doit(fromp)
                        }
                        authopts = KOPT_DO_MUTUAL;
                        rc = krb_recvauth(authopts, 0, ticket,
-                               "rcmd", instance, &fromaddr,
-                               &local_addr, kdata, "", schedule,
-                               version);
+                           "rcmd", instance, (struct sockaddr_in *)&fromaddr,
+                           &local_addr, kdata, "", schedule, version);
                        desrw_set_key(&kdata->session, &schedule);
                } else
 #endif
                        rc = krb_recvauth(authopts, 0, ticket, "rcmd",
-                               instance, &fromaddr,
-                               (struct sockaddr_in *) 0,
-                               kdata, "", (struct des_ks_struct *) 0,
-                               version);
+                           instance, (struct sockaddr_in *)&fromaddr,
+                           NULL, kdata, "", NULL, version);
                if (rc != KSUCCESS) {
                        error("Kerberos authentication failure: %s\n",
                                  krb_get_err_text(rc));