diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -3,6 +3,9 @@ | |||
3 | - deraadt@cvs.openbsd.org 2001/03/05 14:28:47 | 3 | - deraadt@cvs.openbsd.org 2001/03/05 14:28:47 |
4 | [sshd.8] | 4 | [sshd.8] |
5 | alpha order; jcs@rt.fm | 5 | alpha order; jcs@rt.fm |
6 | - stevesk@cvs.openbsd.org 2001/03/05 15:44:51 | ||
7 | [servconf.c] | ||
8 | sync error message; ok markus@ | ||
6 | 9 | ||
7 | 20010305 | 10 | 20010305 |
8 | - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch] | 11 | - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch] |
@@ -4374,4 +4377,4 @@ | |||
4374 | - Wrote replacements for strlcpy and mkdtemp | 4377 | - Wrote replacements for strlcpy and mkdtemp |
4375 | - Released 1.0pre1 | 4378 | - Released 1.0pre1 |
4376 | 4379 | ||
4377 | $Id: ChangeLog,v 1.909 2001/03/06 01:00:03 mouring Exp $ | 4380 | $Id: ChangeLog,v 1.910 2001/03/06 01:02:41 mouring Exp $ |
diff --git a/servconf.c b/servconf.c index 1e38f3b60..075eed400 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.70 2001/03/04 17:42:28 millert Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.71 2001/03/05 15:44:51 stevesk Exp $"); |
14 | 14 | ||
15 | #ifdef KRB4 | 15 | #ifdef KRB4 |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -442,8 +442,9 @@ parse_filename: | |||
442 | intptr = &options->permit_root_login; | 442 | intptr = &options->permit_root_login; |
443 | arg = strdelim(&cp); | 443 | arg = strdelim(&cp); |
444 | if (!arg || *arg == '\0') { | 444 | if (!arg || *arg == '\0') { |
445 | fprintf(stderr, "%s line %d: missing yes/without-password/no argument.\n", | 445 | fprintf(stderr, "%s line %d: missing yes/" |
446 | filename, linenum); | 446 | "without-password/forced-commands-only/no " |
447 | "argument.\n", filename, linenum); | ||
447 | exit(1); | 448 | exit(1); |
448 | } | 449 | } |
449 | if (strcmp(arg, "without-password") == 0) | 450 | if (strcmp(arg, "without-password") == 0) |