Fix a couple of mysig_t leftovers.

diff --git a/auth-pam.c b/auth-pam.c
index 0cd2b00199c9c4f6d90c19384dd2f30d96d409e2..5a3ba09b43d31907575e89877bc92462d7bb9da1 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -100,6 +100,7 @@ extern char *__progname;
 #include "servconf.h"
 #include "ssh2.h"
 #include "auth-options.h"
+#include "misc.h"
 #ifdef GSSAPI
 #include "ssh-gss.h"
 #endif
@@ -151,7 +152,7 @@ static struct pam_ctxt *cleanup_ctxt;
  */
 
 static int sshpam_thread_status = -1;
-static mysig_t sshpam_oldsig;
+static sshsig_t sshpam_oldsig;
 
 static void
 sshpam_sigchld_handler(int sig)

diff --git a/entropy.c b/entropy.c
index 2eebadf4ad167ab5138e1e26caca1a38ea761a49..19ddeeafae3b7bbac1e81b61458d94f96f3d07ed 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -84,7 +84,7 @@ get_random_bytes_prngd(unsigned char *buf, int len,
        struct sockaddr_storage addr;
        struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr;
        struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr;
-       mysig_t old_sigpipe;
+       sshsig_t old_sigpipe;
 
        /* Sanity checks */
        if (socket_path == NULL && tcp_port == 0)

diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index b6b5ab49b8526aa7d253ae39f7015b69594ed4c1..1ab41f42b63404ba45e5a37f5f70b0e2e39c13ea 100644 (file)
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -65,6 +65,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "misc.h"
+
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif
@@ -97,7 +99,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
         */
        int ptm;
        char *pts;
-       mysig_t old_signal;
+       sshsig_t old_signal;
 
        if ((ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY)) == -1)
                return (-1);