diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | loginrec.c | 7 |
2 files changed, 4 insertions, 7 deletions
@@ -5,6 +5,8 @@ | |||
5 | problem on Linux (fixes "could not set controlling tty" errors). | 5 | problem on Linux (fixes "could not set controlling tty" errors). |
6 | - (djm) Merge FreeBSD PAM code: replaces PAM password auth kludge with | 6 | - (djm) Merge FreeBSD PAM code: replaces PAM password auth kludge with |
7 | proper challenge-response module | 7 | proper challenge-response module |
8 | - (djm) 2-clause license on loginrec.c, with permission from | ||
9 | andre@ae-35.com | ||
8 | 10 | ||
9 | 20030504 | 11 | 20030504 |
10 | - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h. | 12 | - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h. |
@@ -1378,4 +1380,4 @@ | |||
1378 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1380 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1379 | ok provos@ | 1381 | ok provos@ |
1380 | 1382 | ||
1381 | $Id: ChangeLog,v 1.2673 2003/05/10 09:28:02 djm Exp $ | 1383 | $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 @@ | |||
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. |
15 | * 3. All advertising materials mentioning features or use of this software | ||
16 | * must display the following acknowledgement: | ||
17 | * This product includes software developed by Markus Friedl. | ||
18 | * 4. The name of the author may not be used to endorse or promote products | ||
19 | * derived from this software without specific prior written permission. | ||
20 | * | 15 | * |
21 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 16 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
22 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
@@ -163,7 +158,7 @@ | |||
163 | #include "log.h" | 158 | #include "log.h" |
164 | #include "atomicio.h" | 159 | #include "atomicio.h" |
165 | 160 | ||
166 | RCSID("$Id: loginrec.c,v 1.50 2003/04/09 11:12:52 djm Exp $"); | 161 | RCSID("$Id: loginrec.c,v 1.51 2003/05/10 13:42:12 djm Exp $"); |
167 | 162 | ||
168 | #ifdef HAVE_UTIL_H | 163 | #ifdef HAVE_UTIL_H |
169 | # include <util.h> | 164 | # include <util.h> |