- (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)

   for UnixWare.

diff --git a/ChangeLog b/ChangeLog
index 55e9f7f403f9aba583b83ccf5d70f8d5f581618d..8e5af010410d3c7430f79303ad9b483b351d0feb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    - dtucker@cvs.openbsd.org 2005/11/29 02:04:55
      [ssh-keygen.c]
      Populate default key sizes before checking them; from & ok tim@
+ - (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)
+   for UnixWare.
 
 20051128
  - (dtucker) [regress/yes-head.sh] Work around breakage caused by some

diff --git a/configure.ac b/configure.ac
index 325e8633575200bfba05ccff27a8f77cbac6a354..8288458b69ba20b706eba75886f697280898a4ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -434,6 +434,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(BROKEN_SETREUID)
        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
+       AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
        ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
@@ -450,6 +451,8 @@ mips-sony-bsd|mips-sony-newsos4)
                AC_DEFINE(BROKEN_LIBIAF, 1,
                        [ia_uinfo routines not supported by OS yet])
                ;;
+       *)      AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+               ;;
        esac
        ;;
 *-*-sysv*)

diff --git a/sshd.8 b/sshd.8
index 94cefdea21691333201663f54a646f71b22b1dae..c610f47b8e0f528d05264477626da06e24ccebcb 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -119,7 +119,7 @@ or its group is listed in
 \&.  The definition of a locked account is system dependant. Some platforms
 have their own account database (eg AIX) and some modify the passwd field (
 .Ql \&*LK\&*
-on Solaris,
+on Solaris and UnixWare,
 .Ql \&*
 on HP-UX, containing
 .Ql Nologin