- (djm) 2-clause license on loginrec.c, with permission from

   andre@ae-35.com

diff --git a/ChangeLog b/ChangeLog
index db8c13b35b9c0d0e647b46e9721598446251a8e3..8cb15daff3cb264ecac2d2f8398e83e7f16e6a5e 100644 (file)
--- 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 0710ab96fd021e4c37e4fb3a0dfac896777f8cba..8e45de7fa11536b4a190226fa30a40913ab62161 100644 (file)
--- 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