4 files changed, 9 insertions, 24 deletions
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index ba3832f3aed..ce1f28fc7e5 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: skey.1,v 1.35 2015/01/16 16:16:36 schwarze Exp $
+.\" $OpenBSD: skey.1,v 1.36 2015/10/09 21:59:34 tim Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
-.Dd $Mdocdate: January 16 2015 $
+.Dd $Mdocdate: October 9 2015 $
 .Dt SKEY 1
 .Os
 .Sh NAME
@@ -83,7 +83,6 @@ Causes output to be in hexadecimal instead of ASCII.
 .Sh EXAMPLES
 .Bd -literal -offset indent
 $ skey 99 th91334
-Reminder - Do not use this program while logged in via telnet.
 Enter secret passphrase: \*(Ltyour secret passphrase is entered here\*(Gt
 OMEN US HORN OMIT BACK AHOY
 $
diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c
index 373da3d5194..1f998b09a63 100644
--- a/usr.bin/skey/skey.c
+++ b/usr.bin/skey/skey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skey.c,v 1.30 2015/10/09 20:24:37 tim Exp $	*/
+/*	$OpenBSD: skey.c,v 1.31 2015/10/09 21:59:34 tim Exp $	*/
 /*
  * OpenBSD S/Key (skey.c)
  *
@@ -114,13 +114,9 @@ main(int argc, char *argv[])
 	}
 
 	/* Get user's secret passphrase */
-	if (!pass) {
-		fputs("Reminder - Do not use this program while"
-		    " logged in via telnet.\n", stderr);
-		if (readpassphrase("Enter secret passphrase: ", passwd,
-		    sizeof(passwd), 0) == NULL || passwd[0] == '\0')
-			exit(1);
-	}
+	if (!pass && (readpassphrase("Enter secret passphrase: ", passwd,
+	    sizeof(passwd), 0) == NULL || passwd[0] == '\0'))
+		exit(1);
 
 	/* Crunch seed and passphrase into starting key */
 	if (keycrunch(key, seed, passwd) != 0)
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 8c5647f2b25..0e1a3060df6 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: skeyinit.1,v 1.40 2015/10/06 15:09:08 tim Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.41 2015/10/09 21:59:34 tim Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
-.Dd $Mdocdate: October 6 2015 $
+.Dd $Mdocdate: October 9 2015 $
 .Dt SKEYINIT 1
 .Os
 .Sh NAME
@@ -153,9 +153,6 @@ directory containing user entries for S/Key
 .Sh EXAMPLES
 .Bd -literal
 $ skeyinit
-Reminder - Only use this method if you are directly connected
-           or have an encrypted channel.  If you are using telnet,
-           hit return now and use skeyinit -s.
 Password: \*(Ltenter your regular password here\*(Gt
 [Updating user with md5]
 Old seed: [md5] host12377
@@ -164,7 +161,6 @@ Again secret passphrase: \*(Ltagain\*(Gt
 ID user skey is otp-md5 100 host12378
 Next login password: CITE BREW IDLE CAIN ROD DOME
 $ otp-md5 -n 3 100 host12378
-Reminder - Do not use this program while logged in via telnet.
 Enter secret passphrase: \*(Lttype your passphrase here\*(Gt
 98: WERE TUG EDDY GEAR GILL TEE
 99: NEAR HA TILT FIN LONG SNOW
diff --git a/usr.bin/skeyinit/skeyinit.c b/usr.bin/skeyinit/skeyinit.c
index a375c2e52fe..0de528dac7e 100644
--- a/usr.bin/skeyinit/skeyinit.c
+++ b/usr.bin/skeyinit/skeyinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skeyinit.c,v 1.60 2015/10/06 15:09:08 tim Exp $	*/
+/*	$OpenBSD: skeyinit.c,v 1.61 2015/10/09 21:59:34 tim Exp $	*/
 
 /* OpenBSD S/Key (skeyinit.c)
  *
@@ -178,12 +178,6 @@ main(int argc, char **argv)
 		break;
 	}
 
-	if (defaultsetup)
-		fputs("Reminder - Only use this method if you are directly "
-		    "connected\n           or have an encrypted channel.  If "
-		    "you are using telnet,\n           hit return now and use "
-		    "skeyinit -s.\n", stderr);
-
 	if (getuid() != 0) {
 		if ((pp = pw_dup(pp)) == NULL)
 			err(1, NULL);