- (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]

   [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
   [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
   [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
   [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
   [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
   [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
   [openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
   [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
   [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
   make the portable tree compile again - sprinkle unistd.h and string.h
   back in. Don't redefine __unused, as it turned out to be used in
   headers on Linux, and replace its use in auth-pam.c with ARGSUSED

diff --git a/ChangeLog b/ChangeLog
index 57c3f5a7d7669e855e2685a0d3c7e25272a85b8f..4766d9ef673d6655ef8ea2171e221edf84c4bfbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,19 @@
      [auth.h dispatch.c kex.h sftp-client.c]
      #include <signal.h> for sig_atomic_t; need this prior to <sys/param.h>
      move
+ - (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]
+   [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
+   [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
+   [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
+   [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
+   [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
+   [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
+   [openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
+   [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
+   [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
+   make the portable tree compile again - sprinkle unistd.h and string.h 
+   back in. Don't redefine __unused, as it turned out to be used in
+   headers on Linux, and replace its use in auth-pam.c with ARGSUSED
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h

diff --git a/acss.c b/acss.c
index c46d28bb49758c17112bc503873d0854526d26ee..37a07dd5d25b703dd5507e98128a0cc436b72ef7 100644 (file)
--- a/acss.c
+++ b/acss.c
@@ -16,6 +16,9 @@
  */
 
 #include "includes.h"
+
+#include <string.h>
+
 #include <openssl/evp.h>
 
 #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00906000L)

diff --git a/auth-krb5.c b/auth-krb5.c
index 8beacc0d4680080f50c8316c31dd6a156964ac32..676b8ab1f37b840997a5b8242ceee7a8207ad965 100644 (file)
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -41,6 +41,8 @@
 
 #ifdef KRB5
 #include <errno.h>
+#include <unistd.h>
+#include <string.h>
 #include <krb5.h>
 
 extern ServerOptions    options;

diff --git a/auth-options.c b/auth-options.c
index 33c62641b0e2edc464558a4c62515bf3d8bb8ffd..cd904967af44c4afb2f368e1010056d214749afd 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -14,9 +14,7 @@
 
 #include <sys/types.h>
 
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <pwd.h>
 #include <string.h>
 

diff --git a/auth-pam.c b/auth-pam.c
index cb8754ec7d95653fb9050215dc764443ea00b836..6ce9db12b2fa9e774b295a3c9f460d2006365711 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -54,6 +54,8 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -152,14 +154,16 @@ sshpam_sigchld_handler(int sig)
                fatal("PAM: authentication thread exited uncleanly");
 }
 
+/* ARGSUSED */
 static void
-pthread_exit(void *value __unused)
+pthread_exit(void *value)
 {
        _exit(0);
 }
 
+/* ARGSUSED */
 static int
-pthread_create(sp_pthread_t *thread, const void *attr __unused,
+pthread_create(sp_pthread_t *thread, const void *attr,
     void *(*thread_start)(void *), void *arg)
 {
        pid_t pid;
@@ -191,8 +195,9 @@ pthread_cancel(sp_pthread_t thread)
        return (kill(thread, SIGTERM));
 }
 
+/* ARGSUSED */
 static int
-pthread_join(sp_pthread_t thread, void **value __unused)
+pthread_join(sp_pthread_t thread, void **value)
 {
        int status;
 

diff --git a/auth-shadow.c b/auth-shadow.c
index c8d5dd3c102706655aac1bc4a1b747fed3de947d..7cd69c21fc9217abb531f5b4f0ff2d48ed4af73c 100644 (file)
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -26,6 +26,7 @@
 
 #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
 #include <shadow.h>
+#include <string.h>
 
 #include "auth.h"
 #include "buffer.h"

diff --git a/canohost.c b/canohost.c
index 97b5a78f9d73b9c7d20b1f02205fe84b6b5c92e4..b40cbf603e6dcd2fb250ce87e7ba6b29ac148277 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -21,9 +21,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <string.h>
 
 #include "packet.h"

diff --git a/channels.c b/channels.c
index 8cf4242feb08f43770065795d273d41989443653..895c43f6a0e37d25c70ca5140ce3e931ffc1a2dd 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -50,9 +50,7 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>

diff --git a/cipher-acss.c b/cipher-acss.c
index 90b51a4d1edbe5fcda11b03a812a4c9f7d0dbc46..cb0bf736c39dfa08bea33e6951da909b4a16d7ec 100644 (file)
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -15,8 +15,11 @@
  */
 
 #include "includes.h"
+
 #include <openssl/evp.h>
 
+#include <string.h>
+
 #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 
 #include "acss.h"

diff --git a/defines.h b/defines.h
index cf1e1a2a5b1e29245efb47aef8eeddf1cb6dd3af..4c949746b5d62d70556ba91f6eea7ba663d46f4d 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -143,16 +143,11 @@ including rpc/rpc.h breaks Solaris 6
 #define INADDR_LOOPBACK ((u_long)0x7f000001)
 #endif
 
-#ifndef __unused
-#define __unused
-#endif
-
 /* Types */
 
 /* If sys/types.h does not supply intXX_t, supply them ourselves */
 /* (or die trying) */
 
-
 #ifndef HAVE_U_INT
 typedef unsigned int u_int;
 #endif

diff --git a/dns.c b/dns.c
index 5f123a2ee075a4739af842d98e9843f7721ddd32..c9368b96bcde226619bf6f528dd9470671020999 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -30,9 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <string.h>
 
 #include "xmalloc.h"

diff --git a/gss-genr.c b/gss-genr.c
index 0497657c08f03baa98ae303c6b17b125a772ca78..522fedab3c3796d19300102b59115e5757a53ff7 100644 (file)
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -29,6 +29,7 @@
 #ifdef GSSAPI
 
 #include <string.h>
+#include <unistd.h>
 
 #include "xmalloc.h"
 #include "bufaux.h"

diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index eae29b2ae5797050e55a2347277c4062f668ff5f..7b78cfe0a48c0b4eb55ce9dbaae17c27cd11e458 100644 (file)
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -29,6 +29,8 @@
 #ifdef GSSAPI
 #ifdef KRB5
 
+#include <string.h>
+
 #include "auth.h"
 #include "xmalloc.h"
 #include "log.h"

diff --git a/gss-serv.c b/gss-serv.c
index c033aad4fd53707dda51aeb975c1787aef847eac..b5c5538fe9ffcc018a1d958e7994abe114937b3d 100644 (file)
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -29,6 +29,7 @@
 #ifdef GSSAPI
 
 #include <string.h>
+#include <unistd.h>
 
 #include "bufaux.h"
 #include "auth.h"

diff --git a/log.h b/log.h
index 9e1a2fcdbe47bf3ccf76e813927a8c6b97c28cd6..15ebc93b5df650f59a70ad9e78977663ea1b5ab8 100644 (file)
--- a/log.h
+++ b/log.h
@@ -15,6 +15,8 @@
 #ifndef SSH_LOG_H
 #define SSH_LOG_H
 
+#include "includes.h"
+
 #include <stdarg.h>
 
 #include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */

diff --git a/loginrec.c b/loginrec.c
index 8299b79e429be03850406f468435ef5c7e03ec23..955d42e8f4c5887145c6232ab2f1b450e748ce3b 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -156,6 +156,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "ssh.h"
 #include "xmalloc.h"

diff --git a/logintest.c b/logintest.c
index 0de928bec066c50518955206785b3a952544fa9c..7e9fbbfbbdc1e5a6cac726af7de233410e9438d8 100644 (file)
--- a/logintest.c
+++ b/logintest.c
@@ -40,9 +40,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <pwd.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif

diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 2c16233c9dc0a5d62365e465db41f00fa57e79b9..ef0eff3b61bc0b57209bac2118db67046609eb45 100644 (file)
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -37,6 +37,7 @@
 #include "includes.h"
 
 #include <errno.h>
+#include <string.h>
 
 #define STARTPORT 600
 #define ENDPORT (IPPORT_RESERVED - 1)

diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c
index 46e0a020fca889bd1e13eb8314d415d2456ae9da..c1aecfe9948f7f947d548a6fa677794850ac1816 100644 (file)
--- a/openbsd-compat/bsd-arc4random.c
+++ b/openbsd-compat/bsd-arc4random.c
@@ -15,6 +15,10 @@
  */
 
 #include "includes.h"
+
+#include <sys/types.h>
+#include <string.h>
+
 #include "log.h"
 
 #ifndef HAVE_ARC4RANDOM

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d2d9ad77171009238de390bb591d78469150f2d2..e6128f9a7363e54fae6cd9200dc181d541d8d380 100644 (file)
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -17,6 +17,7 @@
 
 #include "includes.h"
 
+#include <string.h>
 #include <signal.h>
 
 #include "xmalloc.h"

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index a855ad6d54c41816b0f57b086b5a220599ec03b7..70ef1850d01af00dad8b204b9d8b73c3ea252506 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -49,6 +49,8 @@
 
 #ifndef HAVE_GETRRSETBYNAME
 
+#include <string.h>
+
 #include "getrrsetbyname.h"
 
 #if defined(HAVE_DECL_H_ERRNO) && !HAVE_DECL_H_ERRNO

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index bba4c097608279314b72d01a8de9c76ce42999a6..b4873932a237556bcfe9cb4080c655cd57c05453 100644 (file)
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -41,6 +41,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <pwd.h>
+#include <string.h>
+#include <unistd.h>
 
 static long
 get_arg_max(void)

diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index b8b0793a63631b725cb5de26c0bf1f02367e56e6..2285c84dfd72751dfc4e9bf3fa94a9403bfa7ff8 100644 (file)
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -41,6 +41,7 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
+#include <unistd.h>
 
 #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
 

diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index ecff797d3a2f5d06a4af998543c603d3495f8b93..5dedbdc640658ebe24580e8a72db97d3d307093d 100644 (file)
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -23,6 +23,9 @@
 
 #include "includes.h"
 
+#include <errno.h>
+#include <string.h>
+
 #ifdef WITH_SELINUX
 #include "log.h"
 #include "port-linux.h"

diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index 9806eec7d82708948483a79734287e8ff704b139..f6a6aa9e1267d67c4ce973b24c08f0c1ac2e119b 100644 (file)
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -23,6 +23,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "log.h"
 #include "misc.h"

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index fd9731ac6450d63a1055f4f71a606bde148ca1f9..11bd8f646e1dbeae558d78ff06b287a80e07e8df 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -32,6 +32,8 @@
 #include <fcntl.h>
 #include <readpassphrase.h>
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifdef TCSASOFT
 # define _T_FLUSH      (TCSAFLUSH|TCSASOFT)

diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 32e987deb213dcf2c5e422be1efc6e77c51d0261..7fec73f897f7a5cde009c8b724efc249f88218f8 100644 (file)
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -40,6 +40,7 @@
 #ifdef HAVE_SYS_PSTAT_H
 #include <sys/pstat.h>
 #endif
+#include <string.h>
 
 #define SPT_NONE       0       /* don't use it at all */
 #define SPT_PSTAT      1       /* use pstat(PSTAT_SETCMD, ...) */

diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
index 78ef46b2fa291025dba91d6b5b029ad8810ab962..5b62990b48b97ab82b4e3dfb298831308e6916bb 100644 (file)
--- a/openbsd-compat/xmmap.c
+++ b/openbsd-compat/xmmap.c
@@ -34,6 +34,8 @@
 #include <sys/stat.h>
 
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "log.h"
 

diff --git a/readconf.c b/readconf.c
index 432b80ed0d5cbdde884fe2628501b7a5843de70a..6fe372796ca27c3b2cb75d68617659bb424a69a3 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -22,9 +22,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <string.h>
 #include <unistd.h>
 

diff --git a/servconf.c b/servconf.c
index ce44b5f60c5d09cf84527aaa5ff97ff87e134c26..dca9508ab48c3ed2034b0cab85cbf6395eb956e5 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -15,9 +15,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <string.h>
 #include <unistd.h>
 

diff --git a/ssh-keygen.c b/ssh-keygen.c
index f2d37129b665c5b94f43aa1b9cafcd49403f0d59..17236a55aaba193379c0ef184e58f3e9e245afc8 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -23,9 +23,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 30df75166147cb0836c815ee627a5a92b35073ff..6b706f0af661c7da8f90b81ff6fdb22d93e2dc9d 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -14,9 +14,7 @@
 
 #include <openssl/bn.h>
 
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <setjmp.h>

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 435b839fafd478b7c866feb3f9cd085680c36686..89b8e43422ac313663b1def47f3bdee1c6eb173a 100644 (file)
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -148,7 +148,7 @@ main(int argc, char **argv)
 {
        Buffer b;
        Options options;
-       Key *keys[2], *key;
+       Key *keys[2], *key = NULL;
        struct passwd *pw;
        int key_fd[2], i, found, version = 2, fd;
        u_char *signature, *data;

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index fb6fc28149887239aeaf19e839ebf7c0e14ff39d..121fa52fa11aa3eb2b2c850f5ae517edfa6ff74d 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -41,6 +41,8 @@
 #include <fcntl.h>
 #include <pwd.h>
 #include <signal.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <openssl/rand.h>
 #include <openssl/sha.h>

diff --git a/ssh.c b/ssh.c
index d0d9457c276ee9bac8f54a3b1d9bf8c49a7b6aa6..df787e45f7d0a2ccca267625b900fae3e9d8062a 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -54,9 +54,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif

diff --git a/sshconnect.c b/sshconnect.c
index f33cf52b14a1b1ca77bb37fcd2ac7da678cb9078..21c5203c6f1503e9eb505bf988184eeb12eb1bc1 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -24,9 +24,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif

diff --git a/sshd.c b/sshd.c
index 6428f42a0fccddd874c23cdad938fbd761c81974..cc1ebd8d9a4897ddd09463114e8c3af38837be4b 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -54,9 +54,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
+#include <netdb.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif