- stevesk@cvs.openbsd.org 2001/03/05 15:44:51

     [servconf.c]
     sync error message; ok markus@

diff --git a/ChangeLog b/ChangeLog
index a830ce51abbbfbdfd083452d558d7e170e545ed9..c5a64002cb55e3e3cb78b0a66b8ce7ea08ae96ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - deraadt@cvs.openbsd.org 2001/03/05 14:28:47
      [sshd.8]
      alpha order; jcs@rt.fm
+   - stevesk@cvs.openbsd.org 2001/03/05 15:44:51
+     [servconf.c]
+     sync error message; ok markus@
 
 20010305
  - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch]
@@ -4374,4 +4377,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.909 2001/03/06 01:00:03 mouring Exp $
+$Id: ChangeLog,v 1.910 2001/03/06 01:02:41 mouring Exp $

diff --git a/servconf.c b/servconf.c
index 1e38f3b60f5c295cd20908555cdf8508bfdf566c..075eed400e856bcfb2ea4b0e15fc8d282dce5e73 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.70 2001/03/04 17:42:28 millert Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.71 2001/03/05 15:44:51 stevesk Exp $");
 
 #ifdef KRB4
 #include <krb.h>
@@ -442,8 +442,9 @@ parse_filename:
                        intptr = &options->permit_root_login;
                        arg = strdelim(&cp);
                        if (!arg || *arg == '\0') {
-                               fprintf(stderr, "%s line %d: missing yes/without-password/no argument.\n",
-                                       filename, linenum);
+                               fprintf(stderr, "%s line %d: missing yes/"
+                                   "without-password/forced-commands-only/no "
+                                   "argument.\n", filename, linenum);
                                exit(1);
                        }
                        if (strcmp(arg, "without-password") == 0)