diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-12 16:38:54 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-12 16:38:54 +1000 |
commit | e69f18cbff23f52a9c4fdedd6bb55231231cee86 (patch) | |
tree | 726ca3b558c07b08db19b94d6042d3c801d49850 | |
parent | d900e45faa8c26e07d60ad497d99e99e43d8b0f9 (diff) |
- (djm) Glob manpages in RPM spec files to catch compressed files
- (djm) Full license in auth-pam.c
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 33 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 17 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 16 |
4 files changed, 50 insertions, 20 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20000612 | ||
2 | - (djm) Glob manpages in RPM spec files to catch compressed files | ||
3 | - (djm) Full license in auth-pam.c | ||
4 | |||
1 | 20000610 | 5 | 20000610 |
2 | - (djm) Minor doc tweaks | 6 | - (djm) Minor doc tweaks |
3 | - (djm) Fix for configure on bash2 from Jim Knoble <jmknoble@jmknoble.cx> | 7 | - (djm) Fix for configure on bash2 from Jim Knoble <jmknoble@jmknoble.cx> |
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 @@ | |||
1 | /* | 1 | /* |
2 | * Author: Damien Miller | 2 | * Copyright (c) 2000 Damien Miller. All rights reserved. |
3 | * Copyright (c) 1999 Damien Miller <djm@mindrot.org> | 3 | * |
4 | * All rights reserved | 4 | * Redistribution and use in source and binary forms, with or without |
5 | * Created: Thursday December 30 1999 | 5 | * modification, are permitted provided that the following conditions |
6 | * PAM authentication and session management code. | 6 | * are met: |
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * 3. All advertising materials mentioning features or use of this software | ||
13 | * must display the following acknowledgement: | ||
14 | * This product includes software developed by Markus Friedl. | ||
15 | * 4. The name of the author may not be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
7 | */ | 28 | */ |
8 | 29 | ||
9 | #include "includes.h" | 30 | #include "includes.h" |
@@ -13,7 +34,7 @@ | |||
13 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
14 | #include "servconf.h" | 35 | #include "servconf.h" |
15 | 36 | ||
16 | RCSID("$Id: auth-pam.c,v 1.5 2000/05/31 01:20:12 damien Exp $"); | 37 | RCSID("$Id: auth-pam.c,v 1.6 2000/06/12 06:38:54 djm Exp $"); |
17 | 38 | ||
18 | #define NEW_AUTHTOK_MSG \ | 39 | #define NEW_AUTHTOK_MSG \ |
19 | "Warning: You password has expired, please change it now" | 40 | "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). | |||
119 | This package contains the GNOME passphrase dialog. | 119 | This package contains the GNOME passphrase dialog. |
120 | 120 | ||
121 | %changelog | 121 | %changelog |
122 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
123 | - Glob manpages to catch compressed files | ||
122 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | 124 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> |
123 | - Updated for new location | 125 | - Updated for new location |
124 | - Updated for new gnome-ssh-askpass build | 126 | - Updated for new gnome-ssh-askpass build |
@@ -212,8 +214,8 @@ fi | |||
212 | %doc CREDITS UPGRADING | 214 | %doc CREDITS UPGRADING |
213 | %attr(0755,root,root) /usr/bin/ssh-keygen | 215 | %attr(0755,root,root) /usr/bin/ssh-keygen |
214 | %attr(0755,root,root) /usr/bin/scp | 216 | %attr(0755,root,root) /usr/bin/scp |
215 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1 | 217 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1* |
216 | %attr(0644,root,root) /usr/man/man1/scp.1 | 218 | %attr(0644,root,root) /usr/man/man1/scp.1* |
217 | %attr(0755,root,root) %dir /etc/ssh | 219 | %attr(0755,root,root) %dir /etc/ssh |
218 | %attr(0755,root,root) %dir /usr/libexec/ssh | 220 | %attr(0755,root,root) %dir /usr/libexec/ssh |
219 | 221 | ||
@@ -222,17 +224,17 @@ fi | |||
222 | %attr(4755,root,root) /usr/bin/ssh | 224 | %attr(4755,root,root) /usr/bin/ssh |
223 | %attr(0755,root,root) /usr/bin/ssh-agent | 225 | %attr(0755,root,root) /usr/bin/ssh-agent |
224 | %attr(0755,root,root) /usr/bin/ssh-add | 226 | %attr(0755,root,root) /usr/bin/ssh-add |
225 | %attr(0644,root,root) /usr/man/man1/ssh.1 | 227 | %attr(0644,root,root) /usr/man/man1/ssh.1* |
226 | %attr(0644,root,root) /usr/man/man1/ssh-agent.1 | 228 | %attr(0644,root,root) /usr/man/man1/ssh-agent.1* |
227 | %attr(0644,root,root) /usr/man/man1/ssh-add.1 | 229 | %attr(0644,root,root) /usr/man/man1/ssh-add.1* |
228 | %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config | 230 | %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config |
229 | %attr(-,root,root) /usr/bin/slogin | 231 | %attr(-,root,root) /usr/bin/slogin |
230 | %attr(-,root,root) /usr/man/man1/slogin.1 | 232 | %attr(-,root,root) /usr/man/man1/slogin.1* |
231 | 233 | ||
232 | %files server | 234 | %files server |
233 | %defattr(-,root,root) | 235 | %defattr(-,root,root) |
234 | %attr(0755,root,root) /usr/sbin/sshd | 236 | %attr(0755,root,root) /usr/sbin/sshd |
235 | %attr(0644,root,root) /usr/man/man8/sshd.8 | 237 | %attr(0644,root,root) /usr/man/man8/sshd.8* |
236 | %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config | 238 | %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config |
237 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | 239 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd |
238 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 240 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
@@ -248,3 +250,4 @@ fi | |||
248 | %files askpass-gnome | 250 | %files askpass-gnome |
249 | %defattr(-,root,root) | 251 | %defattr(-,root,root) |
250 | %attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass | 252 | %attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass |
253 | |||
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). | |||
100 | This package contains the GNOME passphrase dialog. | 100 | This package contains the GNOME passphrase dialog. |
101 | 101 | ||
102 | %changelog | 102 | %changelog |
103 | * Mon Jun 12 2000 Damien Miller <djm@mindrot.org> | ||
104 | - Glob manpages to catch compressed files | ||
103 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> | 105 | * Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> |
104 | - Updated for new location | 106 | - Updated for new location |
105 | - Updated for new gnome-ssh-askpass build | 107 | - Updated for new gnome-ssh-askpass build |
@@ -225,8 +227,8 @@ fi | |||
225 | %doc RFC.nroff TODO UPGRADING CREDITS | 227 | %doc RFC.nroff TODO UPGRADING CREDITS |
226 | %attr(0755,root,root) /usr/bin/ssh-keygen | 228 | %attr(0755,root,root) /usr/bin/ssh-keygen |
227 | %attr(0755,root,root) /usr/bin/scp | 229 | %attr(0755,root,root) /usr/bin/scp |
228 | %attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1 | 230 | %attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* |
229 | %attr(0644,root,root) %doc /usr/man/man1/scp.1 | 231 | %attr(0644,root,root) %doc /usr/man/man1/scp.1* |
230 | %attr(0755,root,root) %dir /etc/ssh | 232 | %attr(0755,root,root) %dir /etc/ssh |
231 | %attr(0755,root,root) %dir /usr/libexec/ssh | 233 | %attr(0755,root,root) %dir /usr/libexec/ssh |
232 | 234 | ||
@@ -235,17 +237,17 @@ fi | |||
235 | %attr(4755,root,root) /usr/bin/ssh | 237 | %attr(4755,root,root) /usr/bin/ssh |
236 | %attr(0755,root,root) /usr/bin/ssh-agent | 238 | %attr(0755,root,root) /usr/bin/ssh-agent |
237 | %attr(0755,root,root) /usr/bin/ssh-add | 239 | %attr(0755,root,root) /usr/bin/ssh-add |
238 | %attr(0644,root,root) %doc /usr/man/man1/ssh.1 | 240 | %attr(0644,root,root) %doc /usr/man/man1/ssh.1* |
239 | %attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1 | 241 | %attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1* |
240 | %attr(0644,root,root) %doc /usr/man/man1/ssh-add.1 | 242 | %attr(0644,root,root) %doc /usr/man/man1/ssh-add.1* |
241 | %attr(0644,root,root) %config /etc/ssh/ssh_config | 243 | %attr(0644,root,root) %config /etc/ssh/ssh_config |
242 | %attr(-,root,root) /usr/bin/slogin | 244 | %attr(-,root,root) /usr/bin/slogin |
243 | %attr(-,root,root) %doc /usr/man/man1/slogin.1 | 245 | %attr(-,root,root) %doc /usr/man/man1/slogin.1* |
244 | 246 | ||
245 | %files server | 247 | %files server |
246 | %defattr(-,root,root) | 248 | %defattr(-,root,root) |
247 | %attr(0755,root,root) /usr/sbin/sshd | 249 | %attr(0755,root,root) /usr/sbin/sshd |
248 | %attr(0644,root,root) %doc /usr/man/man8/sshd.8 | 250 | %attr(0644,root,root) %doc /usr/man/man8/sshd.8* |
249 | %attr(0600,root,root) %config /etc/ssh/sshd_config | 251 | %attr(0600,root,root) %config /etc/ssh/sshd_config |
250 | %attr(0644,root,root) %config /etc/pam.d/sshd | 252 | %attr(0644,root,root) %config /etc/pam.d/sshd |
251 | %attr(0755,root,root) %config /sbin/init.d/sshd | 253 | %attr(0755,root,root) %config /sbin/init.d/sshd |