From 26314f6354de5f160f2b3c0ea6b286ca44ded260 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 1 Jun 2004 11:28:20 +1000 Subject: [PATCH] - (djm) [auth-pam.c] Add copyright for local changes --- ChangeLog | 5 ++++- auth-pam.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4ee5bd39..d154c4d5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20040601 + - (djm) [auth-pam.c] Add copyright for local changes + 20040530 - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c] Bug #874: Re-add PAM support for PasswordAuthentication=yes. ok djm@ @@ -1174,4 +1177,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3372 2004/05/31 04:48:40 tim Exp $ +$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 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * Copyright (c) 2003,2004 Damien Miller + * Copyright (c) 2003,2004 Darren Tucker + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ #include "includes.h" -RCSID("$Id: auth-pam.c,v 1.104 2004/05/30 12:04:56 dtucker Exp $"); +RCSID("$Id: auth-pam.c,v 1.105 2004/06/01 01:28:20 djm Exp $"); #ifdef USE_PAM #if defined(HAVE_SECURITY_PAM_APPL_H)