summaryrefslogtreecommitdiff
path: root/lib/libwrap/socket.c
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>1999-08-27 16:06:17 +0000
committeritojun <itojun@NetBSD.org>1999-08-27 16:06:17 +0000
commitb98c263379d9cf3fe2b79c950bdd98c197e78d2d (patch)
treef30f4d27ddfb202e677a42ce0c86804229f93ab9 /lib/libwrap/socket.c
parentfa8f6ba80b71f8c5993d56b197d4df85296dafa2 (diff)
resolve conflicts on upgrade (to 7.6).
Diffstat (limited to 'lib/libwrap/socket.c')
-rw-r--r--lib/libwrap/socket.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libwrap/socket.c b/lib/libwrap/socket.c
index 097ad09eff7..a69a6518ce8 100644
--- a/lib/libwrap/socket.c
+++ b/lib/libwrap/socket.c
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.5 1999/07/03 12:30:42 simonb Exp $ */
+/* $NetBSD: socket.c,v 1.6 1999/08/27 16:06:17 itojun Exp $ */
/*
* This module determines the type of socket (datagram, stream), the client
@@ -20,9 +20,9 @@
#include <sys/cdefs.h>
#ifndef lint
#if 0
-static char sccsid[] = "@(#) socket.c 1.14 95/01/30 19:51:50";
+static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24";
#else
-__RCSID("$NetBSD: socket.c,v 1.5 1999/07/03 12:30:42 simonb Exp $");
+__RCSID("$NetBSD: socket.c,v 1.6 1999/08/27 16:06:17 itojun Exp $");
#endif
#endif
@@ -192,8 +192,8 @@ struct host_info *host;
* problem. It could also be that someone is trying to spoof us.
*/
- tcpd_warn("host name/name mismatch: %s != %s",
- host->name, hp->h_name);
+ tcpd_warn("host name/name mismatch: %s != %.*s",
+ host->name, STRING_LENGTH, hp->h_name);
} else {
@@ -217,8 +217,8 @@ struct host_info *host;
* server.
*/
- tcpd_warn("host name/address mismatch: %s != %s",
- inet_ntoa(sin->sin_addr), hp->h_name);
+ tcpd_warn("host name/address mismatch: %s != %.*s",
+ inet_ntoa(sin->sin_addr), STRING_LENGTH, hp->h_name);
}
/* name is bad, clobber it */
(void)strncpy(host->name, paranoid, sizeof(host->name) - 1);