upstream commit

Compare pointers to NULL rather than 0.

ok djm@

Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8

diff --git a/auth-bsdauth.c b/auth-bsdauth.c
index 37ff893e693854a98f164869f11c5a93bea6f496..e00718f2ed3f1035679392be3d84e1a972c8e591 100644 (file)
--- a/auth-bsdauth.c
+++ b/auth-bsdauth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-bsdauth.c,v 1.13 2014/06/24 01:13:21 djm Exp $ */
+/* $OpenBSD: auth-bsdauth.c,v 1.14 2015/10/20 23:24:25 mmcc Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -103,7 +103,7 @@ bsdauth_respond(void *ctx, u_int numresponses, char **responses)
        if (!authctxt->valid)
                return -1;
 
-       if (authctxt->as == 0)
+       if (authctxt->as == NULL)
                error("bsdauth_respond: no bsd auth session");
 
        if (numresponses != 1)

diff --git a/monitor.c b/monitor.c
index 0af23d65022d6ad6d34f551fc24048470516f82c..395a6f64eb4e1ad22b437dd73baaa832a1e6b9f8 100644 (file)
--- 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;

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 8ff8a0a28893dd988a4a949f1d9ed0cded0f846e..23e0fd7c1cf4c43f411a89d10f7d4dccfe84aa1d 100644 (file)
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-getput-basic.c,v 1.4 2015/01/14 15:02:39 djm Exp $     */
+/*     $OpenBSD: sshbuf-getput-basic.c,v 1.5 2015/10/20 23:24:25 mmcc Exp $    */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -131,7 +131,7 @@ sshbuf_get_string_direct(struct sshbuf *buf, const u_char **valp, size_t *lenp)
                *lenp = 0;
        if ((r = sshbuf_peek_string_direct(buf, &p, &len)) < 0)
                return r;
-       if (valp != 0)
+       if (valp != NULL)
                *valp = p;
        if (lenp != NULL)
                *lenp = len;
@@ -168,7 +168,7 @@ sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp,
                SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE"));
                return SSH_ERR_MESSAGE_INCOMPLETE;
        }
-       if (valp != 0)
+       if (valp != NULL)
                *valp = p + 4;
        if (lenp != NULL)
                *lenp = len;
@@ -448,7 +448,7 @@ sshbuf_get_bignum2_bytes_direct(struct sshbuf *buf,
                d++;
                len--;
        }
-       if (valp != 0)
+       if (valp != NULL)
                *valp = d;
        if (lenp != NULL)
                *lenp = len;