diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-01-08 23:32:04 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-01-08 23:32:04 +1100 |
commit | 0234e8607fc8643c0bf151d735c5771caf61f9f8 (patch) | |
tree | a8a5b044f63523fb478b1bdd0b50c1db1c5f6a2d | |
parent | 409cb328c15fb5ffed00009c3290894bc888e736 (diff) |
- (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and
only define if not already. From des at freebsd.org.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-pam.c | 4 | ||||
-rw-r--r-- | defines.h | 6 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040108 | ||
2 | - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and | ||
3 | only define if not already. From des at freebsd.org. | ||
4 | |||
1 | 20040105 | 5 | 20040105 |
2 | - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from | 6 | - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from |
3 | cjwatson at debian.org. | 7 | cjwatson at debian.org. |
@@ -1650,4 +1654,4 @@ | |||
1650 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1654 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1651 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1655 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1652 | 1656 | ||
1653 | $Id: ChangeLog,v 1.3163 2004/01/05 11:36:51 dtucker Exp $ | 1657 | $Id: ChangeLog,v 1.3164 2004/01/08 12:32:04 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 31e1999f0..5c77edb66 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 32 | /* 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" | 33 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.87 2004/01/02 07:01:31 djm Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.88 2004/01/08 12:32:04 dtucker Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 37 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -59,8 +59,6 @@ extern ServerOptions options; | |||
59 | extern Buffer loginmsg; | 59 | extern Buffer loginmsg; |
60 | extern int compat20; | 60 | extern int compat20; |
61 | 61 | ||
62 | #define __unused | ||
63 | |||
64 | #ifdef USE_POSIX_THREADS | 62 | #ifdef USE_POSIX_THREADS |
65 | #include <pthread.h> | 63 | #include <pthread.h> |
66 | /* | 64 | /* |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.106 2003/12/18 23:58:43 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.107 2004/01/08 12:32:04 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -129,6 +129,10 @@ including rpc/rpc.h breaks Solaris 6 | |||
129 | #define INADDR_LOOPBACK ((u_long)0x7f000001) | 129 | #define INADDR_LOOPBACK ((u_long)0x7f000001) |
130 | #endif | 130 | #endif |
131 | 131 | ||
132 | #ifndef __unused | ||
133 | #define __unused | ||
134 | #endif | ||
135 | |||
132 | /* Types */ | 136 | /* Types */ |
133 | 137 | ||
134 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ | 138 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ |