From owner-cvs-usrbin  Wed Feb  7 07:10:24 1996
Return-Path: owner-cvs-usrbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id HAA05022
          for cvs-usrbin-outgoing; Wed, 7 Feb 1996 07:10:24 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id HAA05012
          Wed, 7 Feb 1996 07:10:20 -0800 (PST)
Date: Wed, 7 Feb 1996 07:10:20 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199602071510.HAA05012@freefall.freebsd.org>
To: CVS-committers, cvs-usrbin
Subject: cvs commit:  src/usr.bin/passwd local_passwd.c
Sender: owner-cvs-usrbin@FreeBSD.ORG
Precedence: bulk

peter       96/02/07 07:10:20

  Branch:      usr.bin/passwd  RELENG_2_1_0
  Modified:    usr.bin/passwd  local_passwd.c
  Log:
  Mark Murray's "Trivial" change to support mixed MD5 and DES passwords.
  If the salt starts with $1$, preserve it rather than overwriting it.
  This allows a dual-personality crypt to sense which algorithm to use.
  
  Some other cosmetic nits from HEAD too (null terminate a salt string in
  #ifdef'ed out code).
  
  Revision  Changes    Path
  1.2.6.4   +19 -6     src/usr.bin/passwd/local_passwd.c