- itojun@cvs.openbsd.org 2001/12/05 03:50:01

     [clientloop.c serverloop.c sshd.c]
     deal with LP64 printf issue with sig_atomic_t.  from thorpej

diff --git a/ChangeLog b/ChangeLog
index 0805b3552503b73af266b511d9595ccb17f9f318..8b6eca2d0aa46797c844a67a0fe50b18c4b1b607 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
    - deraadt@cvs.openbsd.org 2001/12/02 02:08:32
      [sftp-common.c]
      zap };
+   - itojun@cvs.openbsd.org 2001/12/05 03:50:01
+     [clientloop.c serverloop.c sshd.c]
+     deal with LP64 printf issue with sig_atomic_t.  from thorpej
 
 20011126
  - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,

diff --git a/clientloop.c b/clientloop.c
index fcd6afdf6b4031c0ee00745f36435642f7db4598..76b8101fe81ecaecd5b44c0cb8df3ecbfc09a131 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.88 2001/11/22 12:34:22 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.89 2001/12/05 03:50:01 itojun Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -949,7 +949,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        if (received_signal) {
                if (in_non_blocking_mode)       /* XXX */
                        leave_non_blocking();
-               fatal("Killed by signal %d.", received_signal);
+               fatal("Killed by signal %d.", (int) received_signal);
        }
 
        /*

diff --git a/serverloop.c b/serverloop.c
index fd1154157ed0f8cb34d9ff50c2eae6d5cb698937..fd051070d94000316e169b8a1f4625b324ab6940 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.84 2001/11/22 12:34:22 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.85 2001/12/05 03:50:01 itojun Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -266,7 +266,8 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
                tvp = &tv;
        }
        if (tvp!=NULL)
-               debug3("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds);
+               debug3("tvp!=NULL kid %d mili %d", (int) child_terminated,
+                   max_time_milliseconds);
 
        /* Wait for something to happen, or the timeout to expire. */
        ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp);

diff --git a/sshd.c b/sshd.c
index 5a09598c0559b31a821bec051f16b98c9b7e0c22..9b3179bca3b032aeab0f746be79c9fd8eca0d416 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.212 2001/11/22 12:34:22 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.213 2001/12/05 03:50:01 itojun Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -978,7 +978,7 @@ main(int ac, char **av)
                                error("select: %.100s", strerror(errno));
                        if (received_sigterm) {
                                log("Received signal %d; terminating.",
-                                   received_sigterm);
+                                   (int) received_sigterm);
                                close_listen_socks();
                                unlink(options.pid_file);
                                exit(255);