diff --git a/ChangeLog b/ChangeLog index 4acedd1a4..25492fd67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ problem on Linux (fixes "could not set controlling tty" errors). - (djm) Merge FreeBSD PAM code: replaces PAM password auth kludge with proper challenge-response module + - (djm) 2-clause license on loginrec.c, with permission from + andre@ae-35.com 20030504 - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h. @@ -1378,4 +1380,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2673 2003/05/10 09:28:02 djm Exp $ +$Id: ChangeLog,v 1.2674 2003/05/10 13:42:12 djm Exp $ diff --git a/loginrec.c b/loginrec.c index 224a7474e..2d6bc6963 100644 --- a/loginrec.c +++ b/loginrec.c @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Markus Friedl. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -163,7 +158,7 @@ #include "log.h" #include "atomicio.h" -RCSID("$Id: loginrec.c,v 1.50 2003/04/09 11:12:52 djm Exp $"); +RCSID("$Id: loginrec.c,v 1.51 2003/05/10 13:42:12 djm Exp $"); #ifdef HAVE_UTIL_H # include