From ff4350e1b8b43bf55cfe91caa807574b02d9d02e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 11 Nov 2008 16:31:05 +1100
Subject: [PATCH]  - (dtucker) OpenBSD CVS Sync    - jmc@cvs.openbsd.org
 2008/11/05 11:22:54      [servconf.c]      passord -> password;      fixes
 user/5975 from Rene Maroufi

---
 ChangeLog  | 9 ++++++++-
 servconf.c | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b4594114..60004eb14 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
@@ -4889,4 +4896,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5132 2008/11/05 05:30:31 djm Exp $
+$Id: ChangeLog,v 1.5133 2008/11/11 05:31:05 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index c7d2d0b94..053e20a78 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: