tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and 

only define if not already.  From des at freebsd.org.
This commit is contained in:
Darren Tucker 2004-01-08 23:32:04 +11:00
parent 409cb328c1
commit 0234e8607f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20040108
- (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and
only define if not already. From des at freebsd.org.
20040105 20040105
- (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from
cjwatson at debian.org. cjwatson at debian.org.
@ -1650,4 +1654,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3163 2004/01/05 11:36:51 dtucker Exp $ $Id: ChangeLog,v 1.3164 2004/01/08 12:32:04 dtucker Exp $

4
auth-pam.c
View File

@ -31,7 +31,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.87 2004/01/02 07:01:31 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.88 2004/01/08 12:32:04 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -59,8 +59,6 @@ extern ServerOptions options;
extern Buffer loginmsg; extern Buffer loginmsg;
extern int compat20; extern int compat20;
#define __unused
#ifdef USE_POSIX_THREADS #ifdef USE_POSIX_THREADS
#include <pthread.h> #include <pthread.h>
/* /*

6
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.106 2003/12/18 23:58:43 dtucker Exp $ */ /* $Id: defines.h,v 1.107 2004/01/08 12:32:04 dtucker Exp $ */
/* Constants */ /* Constants */
@ -129,6 +129,10 @@ including rpc/rpc.h breaks Solaris 6
#define INADDR_LOOPBACK ((u_long)0x7f000001) #define INADDR_LOOPBACK ((u_long)0x7f000001)
#endif #endif
#ifndef __unused
#define __unused
#endif
/* Types */ /* Types */
/* If sys/types.h does not supply intXX_t, supply them ourselves */ /* If sys/types.h does not supply intXX_t, supply them ourselves */