- OpenBSD CVS updates:
   - [atomicio.c auth-krb4.c bufaux.c channels.c compress.c fingerprint.c]
     [packet.h radix.c rsa.c scp.c ssh-agent.c ssh-keygen.c sshconnect.c]
     [sshd.c]
     pedantic: signed vs. unsigned, void*-arithm, etc
   - [ssh.1 sshd.8]
     Various cleanups and standardizations.
diff --git a/auth-krb4.c b/auth-krb4.c
index fb0e20c..95fc722 100644
--- a/auth-krb4.c
+++ b/auth-krb4.c
@@ -186,19 +186,20 @@
 	KTEXT_ST reply;
 	char instance[INST_SZ];
 	int r, s;
+	socklen_t slen;
 	u_int cksum;
 	Key_schedule schedule;
 	struct sockaddr_in local, foreign;
 
 	s = packet_get_connection_in();
 
-	r = sizeof(local);
+	slen = sizeof(local);
 	memset(&local, 0, sizeof(local));
-	if (getsockname(s, (struct sockaddr *) & local, &r) < 0)
+	if (getsockname(s, (struct sockaddr *) & local, &slen) < 0)
 		debug("getsockname failed: %.100s", strerror(errno));
-	r = sizeof(foreign);
+	slen = sizeof(foreign);
 	memset(&foreign, 0, sizeof(foreign));
-	if (getpeername(s, (struct sockaddr *) & foreign, &r) < 0) {
+	if (getpeername(s, (struct sockaddr *) & foreign, &slen) < 0) {
 		debug("getpeername failed: %.100s", strerror(errno));
 		fatal_cleanup();
 	}