[monitor_wrap.c]
     check pmonitor != NULL
This commit is contained in:
Darren Tucker 2003-11-03 20:03:25 +11:00
parent 7c582db74b
commit a47c9bcda6
2 changed files with 7 additions and 3 deletions

View File

@ -2,6 +2,10 @@
- (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
are created correctly with CRLF line terminations. Patch from vinschen at are created correctly with CRLF line terminations. Patch from vinschen at
redhat.com. redhat.com.
- (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/10/15 09:48:45
[monitor_wrap.c]
check pmonitor != NULL
20031021 20031021
- (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
@ -1376,4 +1380,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.3086 2003/11/03 07:59:29 dtucker Exp $ $Id: ChangeLog,v 1.3087 2003/11/03 09:03:25 dtucker Exp $

View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor_wrap.c,v 1.33 2003/10/11 11:36:23 markus Exp $"); RCSID("$OpenBSD: monitor_wrap.c,v 1.34 2003/10/15 09:48:45 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dh.h> #include <openssl/dh.h>
@ -73,7 +73,7 @@ mm_is_monitor(void)
* m_pid is only set in the privileged part, and * m_pid is only set in the privileged part, and
* points to the unprivileged child. * points to the unprivileged child.
*/ */
return (pmonitor->m_pid > 0); return (pmonitor && pmonitor->m_pid > 0);
} }
void void