diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-01 11:28:20 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-01 11:28:20 +1000 |
commit | 26314f6354de5f160f2b3c0ea6b286ca44ded260 (patch) | |
tree | bebf4038507bf0e4093c7bb70a937ddef0aad70e | |
parent | 2d2b9f706fda68a0b251f2bca42332a99fba12e1 (diff) |
- (djm) [auth-pam.c] Add copyright for local changes
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-pam.c | 18 |
2 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20040601 | ||
2 | - (djm) [auth-pam.c] Add copyright for local changes | ||
3 | |||
1 | 20040530 | 4 | 20040530 |
2 | - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c] Bug #874: Re-add PAM | 5 | - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c] Bug #874: Re-add PAM |
3 | support for PasswordAuthentication=yes. ok djm@ | 6 | support for PasswordAuthentication=yes. ok djm@ |
@@ -1174,4 +1177,4 @@ | |||
1174 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1177 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1175 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1178 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1176 | 1179 | ||
1177 | $Id: ChangeLog,v 1.3372 2004/05/31 04:48:40 tim Exp $ | 1180 | $Id: ChangeLog,v 1.3373 2004/06/01 01:28:21 djm Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index b6fc49ee8..c99890b25 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -28,10 +28,26 @@ | |||
28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
29 | * SUCH DAMAGE. | 29 | * SUCH DAMAGE. |
30 | */ | 30 | */ |
31 | /* | ||
32 | * Copyright (c) 2003,2004 Damien Miller <djm@mindrot.org> | ||
33 | * Copyright (c) 2003,2004 Darren Tucker <dtucker@zip.com.au> | ||
34 | * | ||
35 | * Permission to use, copy, modify, and distribute this software for any | ||
36 | * purpose with or without fee is hereby granted, provided that the above | ||
37 | * copyright notice and this permission notice appear in all copies. | ||
38 | * | ||
39 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
40 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
41 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
42 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
43 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
44 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
45 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
46 | */ | ||
31 | 47 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 49 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.104 2004/05/30 12:04:56 dtucker Exp $"); | 50 | RCSID("$Id: auth-pam.c,v 1.105 2004/06/01 01:28:20 djm Exp $"); |
35 | 51 | ||
36 | #ifdef USE_PAM | 52 | #ifdef USE_PAM |
37 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 53 | #if defined(HAVE_SECURITY_PAM_APPL_H) |