diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | sshd.8 | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -5,6 +5,8 @@ | |||
5 | - dtucker@cvs.openbsd.org 2005/11/29 02:04:55 | 5 | - dtucker@cvs.openbsd.org 2005/11/29 02:04:55 |
6 | [ssh-keygen.c] | 6 | [ssh-keygen.c] |
7 | Populate default key sizes before checking them; from & ok tim@ | 7 | Populate default key sizes before checking them; from & ok tim@ |
8 | - (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string) | ||
9 | for UnixWare. | ||
8 | 10 | ||
9 | 20051128 | 11 | 20051128 |
10 | - (dtucker) [regress/yes-head.sh] Work around breakage caused by some | 12 | - (dtucker) [regress/yes-head.sh] Work around breakage caused by some |
@@ -3383,4 +3385,4 @@ | |||
3383 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3385 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3384 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3386 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3385 | 3387 | ||
3386 | $Id: ChangeLog,v 1.4014 2005/11/29 02:10:24 dtucker Exp $ | 3388 | $Id: ChangeLog,v 1.4015 2005/11/29 02:40:34 tim Exp $ |
diff --git a/configure.ac b/configure.ac index ffa94e863..0afb48716 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.311 2005/11/26 11:24:10 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.312 2005/11/29 02:40:34 tim Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -434,6 +434,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
434 | AC_DEFINE(BROKEN_SETREUID) | 434 | AC_DEFINE(BROKEN_SETREUID) |
435 | AC_DEFINE(BROKEN_SETREGID) | 435 | AC_DEFINE(BROKEN_SETREGID) |
436 | AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd]) | 436 | AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd]) |
437 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | ||
437 | ;; | 438 | ;; |
438 | # UnixWare 7.x, OpenUNIX 8 | 439 | # UnixWare 7.x, OpenUNIX 8 |
439 | *-*-sysv5*) | 440 | *-*-sysv5*) |
@@ -450,6 +451,8 @@ mips-sony-bsd|mips-sony-newsos4) | |||
450 | AC_DEFINE(BROKEN_LIBIAF, 1, | 451 | AC_DEFINE(BROKEN_LIBIAF, 1, |
451 | [ia_uinfo routines not supported by OS yet]) | 452 | [ia_uinfo routines not supported by OS yet]) |
452 | ;; | 453 | ;; |
454 | *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | ||
455 | ;; | ||
453 | esac | 456 | esac |
454 | ;; | 457 | ;; |
455 | *-*-sysv*) | 458 | *-*-sysv*) |
@@ -119,7 +119,7 @@ or its group is listed in | |||
119 | \&. The definition of a locked account is system dependant. Some platforms | 119 | \&. The definition of a locked account is system dependant. Some platforms |
120 | have their own account database (eg AIX) and some modify the passwd field ( | 120 | have their own account database (eg AIX) and some modify the passwd field ( |
121 | .Ql \&*LK\&* | 121 | .Ql \&*LK\&* |
122 | on Solaris, | 122 | on Solaris and UnixWare, |
123 | .Ql \&* | 123 | .Ql \&* |
124 | on HP-UX, containing | 124 | on HP-UX, containing |
125 | .Ql Nologin | 125 | .Ql Nologin |