summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--monitor_wrap.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a9340f70..e5db31fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
2 - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services 2 - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
3 are created correctly with CRLF line terminations. Patch from vinschen at 3 are created correctly with CRLF line terminations. Patch from vinschen at
4 redhat.com. 4 redhat.com.
5 - (dtucker) OpenBSD CVS Sync
6 - markus@cvs.openbsd.org 2003/10/15 09:48:45
7 [monitor_wrap.c]
8 check pmonitor != NULL
5 9
620031021 1020031021
7 - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords 11 - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
@@ -1376,4 +1380,4 @@
1376 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1380 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1377 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1381 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1378 1382
1379$Id: ChangeLog,v 1.3086 2003/11/03 07:59:29 dtucker Exp $ 1383$Id: ChangeLog,v 1.3087 2003/11/03 09:03:25 dtucker Exp $
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e19984ec0..fe1460422 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor_wrap.c,v 1.33 2003/10/11 11:36:23 markus Exp $"); 28RCSID("$OpenBSD: monitor_wrap.c,v 1.34 2003/10/15 09:48:45 markus Exp $");
29 29
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
@@ -73,7 +73,7 @@ mm_is_monitor(void)
73 * m_pid is only set in the privileged part, and 73 * m_pid is only set in the privileged part, and
74 * points to the unprivileged child. 74 * points to the unprivileged child.
75 */ 75 */
76 return (pmonitor->m_pid > 0); 76 return (pmonitor && pmonitor->m_pid > 0);
77} 77}
78 78
79void 79void