From: dtucker <dtucker>
Date: Mon, 3 Nov 2003 09:03:25 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2003/10/15 09:48:45
X-Git-Tag: V_3_8_P1~183
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/74677ba36d1569f665b1b075ce64b92cd23a764c

   - markus@cvs.openbsd.org 2003/10/15 09:48:45
     [monitor_wrap.c]
     check pmonitor != NULL
---

diff --git a/ChangeLog b/ChangeLog
index 4b50d6ce..e2d8e016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
    are created correctly with CRLF line terminations.  Patch from vinschen at
    redhat.com.
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/10/15 09:48:45
+     [monitor_wrap.c]
+     check pmonitor != NULL
 
 20031021
  - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e19984ec..fe146042 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #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/dh.h>
@@ -73,7 +73,7 @@ mm_is_monitor(void)
 	 * m_pid is only set in the privileged part, and
 	 * points to the unprivileged child.
 	 */
-	return (pmonitor->m_pid > 0);
+	return (pmonitor && pmonitor->m_pid > 0);
 }
 
 void