diff --git a/ChangeLog b/ChangeLog index 2847b0bd0..f134939d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ PAM_NEW_AUTHTOK_REQD remains in #if 0 for now. - (stevesk) [auth-pam.c] cast to avoid initialization type mismatch warning on pam_conv struct conversation function. + - (stevesk) [auth-pam.h] license 20020720 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). @@ -1405,4 +1406,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2383 2002/07/21 22:49:47 stevesk Exp $ +$Id: ChangeLog,v 1.2384 2002/07/21 23:16:00 stevesk Exp $ diff --git a/auth-pam.h b/auth-pam.h index 6b1f35add..148ebe0c8 100644 --- a/auth-pam.h +++ b/auth-pam.h @@ -1,4 +1,28 @@ -/* $Id: auth-pam.h,v 1.12 2002/04/04 19:02:28 stevesk Exp $ */ +/* $Id: auth-pam.h,v 1.13 2002/07/21 23:16:01 stevesk Exp $ */ + +/* + * Copyright (c) 2000 Damien Miller. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "includes.h" #ifdef USE_PAM