From 23ab1f36c327370793bc9470e535058de74587af Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sat, 10 May 2003 13:42:12 +0000
Subject: [PATCH]  - (djm) 2-clause license on loginrec.c, with permission from
    andre@ae-35.com

---
 ChangeLog  | 2 ++
 loginrec.c | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db8c13b3..8cb15daf 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.
diff --git a/loginrec.c b/loginrec.c
index 0710ab96..8e45de7f 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
-- 
2.45.1