summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-11-11 16:31:05 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-11-11 16:31:05 +1100
commitff4350e1b8b43bf55cfe91caa807574b02d9d02e (patch)
treeba950a0fbe6cf3aba9dfdd0221f4f8414c05d5aa
parent0164cb8a87cf3060f13954ce4e842ecbe8316817 (diff)
- (dtucker) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2008/11/05 11:22:54 [servconf.c] passord -> password; fixes user/5975 from Rene Maroufi
-rw-r--r--ChangeLog9
-rw-r--r--servconf.c4
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 @@
120081111
2 - (dtucker) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2008/11/05 11:22:54
4 [servconf.c]
5 passord -> password;
6 fixes user/5975 from Rene Maroufi
7
120081105 820081105
2 - OpenBSD CVS Sync 9 - OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2008/11/03 08:59:41 10 - djm@cvs.openbsd.org 2008/11/03 08:59:41
@@ -4889,4 +4896,4 @@
4889 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4896 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4890 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4897 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4891 4898
4892$Id: ChangeLog,v 1.5132 2008/11/05 05:30:31 djm Exp $ 4899$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 @@
1/* $OpenBSD: servconf.c,v 1.190 2008/11/04 08:22:13 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.191 2008/11/05 11:22:54 jmc Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1454,7 +1454,7 @@ fmt_intarg(ServerOpCodes code, int val)
1454 if (code == sPermitRootLogin) { 1454 if (code == sPermitRootLogin) {
1455 switch (val) { 1455 switch (val) {
1456 case PERMIT_NO_PASSWD: 1456 case PERMIT_NO_PASSWD:
1457 return "without-passord"; 1457 return "without-password";
1458 case PERMIT_FORCED_ONLY: 1458 case PERMIT_FORCED_ONLY:
1459 return "forced-commands-only"; 1459 return "forced-commands-only";
1460 case PERMIT_YES: 1460 case PERMIT_YES: