[openssh-commits] [openssh] 01/02: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit e92c499a75477ecfe94dd7b4aed89f20b1fac5a7
Author: mmcc at openbsd.org <mmcc at openbsd.org>
Date:   Fri Oct 16 17:07:24 2015 +0000

    upstream commit
    
    0 -> NULL when comparing with a char*.
    
    ok dtucker@, djm at .
    
    Upstream-ID: a928e9c21c0a9020727d99738ff64027c1272300
---
 scp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scp.c b/scp.c
index 593fe89..842dc66 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.183 2015/10/16 17:07:24 mmcc Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -866,7 +866,7 @@ rsource(char *name, struct stat *statp)
 		return;
 	}
 	last = strrchr(name, '/');
-	if (last == 0)
+	if (last == NULL)
 		last = name;
 	else
 		last++;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.