diff --git a/usr.sbin/tcpdchk/inetcf.c b/usr.sbin/tcpdchk/inetcf.c
index c48301146336..d87e7c27e8b6 100644
--- a/usr.sbin/tcpdchk/inetcf.c
+++ b/usr.sbin/tcpdchk/inetcf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inetcf.c,v 1.7 2002/06/06 21:27:49 itojun Exp $	*/
+/*	$NetBSD: inetcf.c,v 1.8 2003/07/13 12:07:16 itojun Exp $	*/
 
  /*
   * Routines to parse an inetd.conf or tlid.conf file. This would be a great
@@ -12,7 +12,7 @@
 #if 0
 static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
 #else
-__RCSID("$NetBSD: inetcf.c,v 1.7 2002/06/06 21:27:49 itojun Exp $");
+__RCSID("$NetBSD: inetcf.c,v 1.8 2003/07/13 12:07:16 itojun Exp $");
 #endif
 #endif
 
@@ -262,7 +262,7 @@ char   *arg1;
 		tcpd_warn("%s: not executable", arg0);
 	    }
 	} else {				/* look in REAL_DAEMON_DIR */
-	    sprintf(daemon, "%s/%s", REAL_DAEMON_DIR, arg0);
+	    snprintf(daemon, sizeof(daemon), "%s/%s", REAL_DAEMON_DIR, arg0);
 	    if (check_path(daemon, &st) < 0) {
 		tcpd_warn("%s: not found in %s: %m",
 			  arg0, REAL_DAEMON_DIR);
@@ -278,7 +278,7 @@ char   *arg1;
 	 * recipe. Look for a file with the same basename in REAL_DAEMON_DIR.
 	 * Draw some conservative conclusions when a distinct file is found.
 	 */
-	sprintf(daemon, "%s/%s", REAL_DAEMON_DIR, arg0);
+	snprintf(daemon, sizeof(daemon), "%s/%s", REAL_DAEMON_DIR, arg0);
 	if (STR_EQ(path, daemon)) {
 	    wrap_status = WR_NOT;
 	} else if (check_path(daemon, &st) >= 0) {
diff --git a/usr.sbin/tcpdchk/tcpdchk.c b/usr.sbin/tcpdchk/tcpdchk.c
index a53c6ff58e03..a97cb6ad31a0 100644
--- a/usr.sbin/tcpdchk/tcpdchk.c
+++ b/usr.sbin/tcpdchk/tcpdchk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcpdchk.c,v 1.10 2002/06/06 21:28:51 itojun Exp $	*/
+/*	$NetBSD: tcpdchk.c,v 1.11 2003/07/13 12:07:16 itojun Exp $	*/
 
  /*
   * tcpdchk - examine all tcpd access control rules and inetd.conf entries
@@ -21,7 +21,7 @@
 #if 0
 static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";
 #else
-__RCSID("$NetBSD: tcpdchk.c,v 1.10 2002/06/06 21:28:51 itojun Exp $");
+__RCSID("$NetBSD: tcpdchk.c,v 1.11 2003/07/13 12:07:16 itojun Exp $");
 #endif
 #endif
 
@@ -296,7 +296,7 @@ char   *list;
     char   *next;
 
     fputs(title, stdout);
-    strcpy(buf, list);
+    strlcpy(buf, list, sizeof(buf));
 
     for (cp = strtok(buf, sep); cp != 0; cp = next) {
 	fputs(cp, stdout);
@@ -317,7 +317,7 @@ char   *list;
     char   *host;
     int     daemons = 0;
 
-    strcpy(buf, list);
+    strlcpy(buf, list, sizeof(buf));
 
     for (cp = strtok(buf, sep); cp != 0; cp = strtok((char *) 0, sep)) {
 	if (STR_EQ(cp, "EXCEPT")) {
@@ -348,7 +348,7 @@ char   *list;
     int l;
 #endif
 
-    strcpy(buf, list);
+    strlcpy(buf, list, sizeof(buf));
 
     for (cp = strtok(buf, sep); cp != 0; cp = strtok((char *) 0, sep)) {
 #ifdef INET6