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

Fix a couple of mysig_t leftovers.

This commit is contained in:
Darren Tucker 2020-01-23 21:06:45 +11:00
parent 84226b447d
commit 945bf52c3c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auth-pam.c
View File

@ -100,6 +100,7 @@ extern char *__progname;
#include "servconf.h" #include "servconf.h"
#include "ssh2.h" #include "ssh2.h"
#include "auth-options.h" #include "auth-options.h"
#include "misc.h"
#ifdef GSSAPI #ifdef GSSAPI
#include "ssh-gss.h" #include "ssh-gss.h"
#endif #endif
@ -151,7 +152,7 @@ static struct pam_ctxt *cleanup_ctxt;
*/ */
static int sshpam_thread_status = -1; static int sshpam_thread_status = -1;
static mysig_t sshpam_oldsig; static sshsig_t sshpam_oldsig;
static void static void
sshpam_sigchld_handler(int sig) sshpam_sigchld_handler(int sig)

2
entropy.c
View File

@ -84,7 +84,7 @@ get_random_bytes_prngd(unsigned char *buf, int len,
struct sockaddr_storage addr; struct sockaddr_storage addr;
struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr; struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr;
struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr; struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr;
mysig_t old_sigpipe; sshsig_t old_sigpipe;
/* Sanity checks */ /* Sanity checks */
if (socket_path == NULL && tcp_port == 0) if (socket_path == NULL && tcp_port == 0)

4
openbsd-compat/bsd-openpty.c
View File

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