From e69f18cbff23f52a9c4fdedd6bb55231231cee86 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 12 Jun 2000 16:38:54 +1000 Subject: - (djm) Glob manpages in RPM spec files to catch compressed files - (djm) Full license in auth-pam.c --- ChangeLog | 4 ++++ auth-pam.c | 33 +++++++++++++++++++++++++++------ contrib/redhat/openssh.spec | 17 ++++++++++------- contrib/suse/openssh.spec | 16 +++++++++------- 4 files changed, 50 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e7d2dc7d..060539f59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20000612 + - (djm) Glob manpages in RPM spec files to catch compressed files + - (djm) Full license in auth-pam.c + 20000610 - (djm) Minor doc tweaks - (djm) Fix for configure on bash2 from Jim Knoble diff --git a/auth-pam.c b/auth-pam.c index 174d289f3..67a851d1b 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -1,9 +1,30 @@ /* - * Author: Damien Miller - * Copyright (c) 1999 Damien Miller - * All rights reserved - * Created: Thursday December 30 1999 - * PAM authentication and session management code. + * 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. + * 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 + * 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" @@ -13,7 +34,7 @@ #include "xmalloc.h" #include "servconf.h" -RCSID("$Id: auth-pam.c,v 1.5 2000/05/31 01:20:12 damien Exp $"); +RCSID("$Id: auth-pam.c,v 1.6 2000/06/12 06:38:54 djm Exp $"); #define NEW_AUTHTOK_MSG \ "Warning: You password has expired, please change it now" diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index d9a0ff53f..9005ed9f0 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -119,6 +119,8 @@ patented algorithms to seperate libraries (OpenSSL). This package contains the GNOME passphrase dialog. %changelog +* Mon Jun 12 2000 Damien Miller +- Glob manpages to catch compressed files * Wed Mar 15 2000 Damien Miller - Updated for new location - Updated for new gnome-ssh-askpass build @@ -212,8 +214,8 @@ fi %doc CREDITS UPGRADING %attr(0755,root,root) /usr/bin/ssh-keygen %attr(0755,root,root) /usr/bin/scp -%attr(0644,root,root) /usr/man/man1/ssh-keygen.1 -%attr(0644,root,root) /usr/man/man1/scp.1 +%attr(0644,root,root) /usr/man/man1/ssh-keygen.1* +%attr(0644,root,root) /usr/man/man1/scp.1* %attr(0755,root,root) %dir /etc/ssh %attr(0755,root,root) %dir /usr/libexec/ssh @@ -222,17 +224,17 @@ fi %attr(4755,root,root) /usr/bin/ssh %attr(0755,root,root) /usr/bin/ssh-agent %attr(0755,root,root) /usr/bin/ssh-add -%attr(0644,root,root) /usr/man/man1/ssh.1 -%attr(0644,root,root) /usr/man/man1/ssh-agent.1 -%attr(0644,root,root) /usr/man/man1/ssh-add.1 +%attr(0644,root,root) /usr/man/man1/ssh.1* +%attr(0644,root,root) /usr/man/man1/ssh-agent.1* +%attr(0644,root,root) /usr/man/man1/ssh-add.1* %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config %attr(-,root,root) /usr/bin/slogin -%attr(-,root,root) /usr/man/man1/slogin.1 +%attr(-,root,root) /usr/man/man1/slogin.1* %files server %defattr(-,root,root) %attr(0755,root,root) /usr/sbin/sshd -%attr(0644,root,root) /usr/man/man8/sshd.8 +%attr(0644,root,root) /usr/man/man8/sshd.8* %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd %attr(0755,root,root) %config /etc/rc.d/init.d/sshd @@ -248,3 +250,4 @@ fi %files askpass-gnome %defattr(-,root,root) %attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass + diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index c54fccfa5..c28a58d76 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -100,6 +100,8 @@ patented algorithms to seperate libraries (OpenSSL). This package contains the GNOME passphrase dialog. %changelog +* Mon Jun 12 2000 Damien Miller +- Glob manpages to catch compressed files * Wed Mar 15 2000 Damien Miller - Updated for new location - Updated for new gnome-ssh-askpass build @@ -225,8 +227,8 @@ fi %doc RFC.nroff TODO UPGRADING CREDITS %attr(0755,root,root) /usr/bin/ssh-keygen %attr(0755,root,root) /usr/bin/scp -%attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1 -%attr(0644,root,root) %doc /usr/man/man1/scp.1 +%attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* +%attr(0644,root,root) %doc /usr/man/man1/scp.1* %attr(0755,root,root) %dir /etc/ssh %attr(0755,root,root) %dir /usr/libexec/ssh @@ -235,17 +237,17 @@ fi %attr(4755,root,root) /usr/bin/ssh %attr(0755,root,root) /usr/bin/ssh-agent %attr(0755,root,root) /usr/bin/ssh-add -%attr(0644,root,root) %doc /usr/man/man1/ssh.1 -%attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1 -%attr(0644,root,root) %doc /usr/man/man1/ssh-add.1 +%attr(0644,root,root) %doc /usr/man/man1/ssh.1* +%attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1* +%attr(0644,root,root) %doc /usr/man/man1/ssh-add.1* %attr(0644,root,root) %config /etc/ssh/ssh_config %attr(-,root,root) /usr/bin/slogin -%attr(-,root,root) %doc /usr/man/man1/slogin.1 +%attr(-,root,root) %doc /usr/man/man1/slogin.1* %files server %defattr(-,root,root) %attr(0755,root,root) /usr/sbin/sshd -%attr(0644,root,root) %doc /usr/man/man8/sshd.8 +%attr(0644,root,root) %doc /usr/man/man8/sshd.8* %attr(0600,root,root) %config /etc/ssh/sshd_config %attr(0644,root,root) %config /etc/pam.d/sshd %attr(0755,root,root) %config /sbin/init.d/sshd -- cgit v1.2.3