From: dtucker <dtucker>
Date: Tue, 11 Nov 2008 05:31:05 +0000 (+0000)
Subject:  - (dtucker) OpenBSD CVS Sync
X-Git-Tag: V_5_2_P1~74
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/0bd3332ccc001b4ffbe724585950952c373125ea

 - (dtucker) OpenBSD CVS Sync
   - jmc@cvs.openbsd.org 2008/11/05 11:22:54
     [servconf.c]
     passord -> password;
     fixes user/5975 from Rene Maroufi
---

diff --git a/ChangeLog b/ChangeLog
index 70d05fab..3e72ad13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20081111
+ - (dtucker) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2008/11/05 11:22:54
+     [servconf.c]
+     passord -> password;
+     fixes user/5975 from Rene Maroufi
+
 20081105
  - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2008/11/03 08:59:41
diff --git a/servconf.c b/servconf.c
index c7d2d0b9..053e20a7 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.190 2008/11/04 08:22:13 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.191 2008/11/05 11:22:54 jmc Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1454,7 +1454,7 @@ fmt_intarg(ServerOpCodes code, int val)
 	if (code == sPermitRootLogin) {
 		switch (val) {
 		case PERMIT_NO_PASSWD:
-			return "without-passord";
+			return "without-password";
 		case PERMIT_FORCED_ONLY:
 			return "forced-commands-only";
 		case PERMIT_YES: