summaryrefslogtreecommitdiffstats
path: root/monitor.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-10-20 23:24:25 +0000
committerDamien Miller <djm@mindrot.org>2015-10-25 11:42:04 +1100
commit7d6c0362039ceacdc1366b5df29ad5d2693c13e5 (patch)
treed87b5de914604d6828303de6e5b0f3aa3d9258d2 /monitor.c
parentf98a09cacff7baad8748c9aa217afd155a4d493f (diff)
upstream commit
Compare pointers to NULL rather than 0. ok djm@ Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index 0af23d65..395a6f64 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.153 2015/09/04 04:44:08 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.154 2015/10/20 23:24:25 mmcc Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -966,7 +966,7 @@ mm_answer_bsdauthrespond(int sock, Buffer *m)
char *response;
int authok;
- if (authctxt->as == 0)
+ if (authctxt->as == NULL)
fatal("%s: no bsd auth session", __func__);
response = buffer_get_string(m, NULL);
@@ -1847,7 +1847,7 @@ monitor_apply_keystate(struct monitor *pmonitor)
sshbuf_free(child_state);
child_state = NULL;
- if ((kex = ssh->kex) != 0) {
+ if ((kex = ssh->kex) != NULL) {
/* XXX set callbacks */
#ifdef WITH_OPENSSL
kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;