# HG changeset patch
# User Huie-Ying Lee <Huie-Ying.Lee@Sun.COM>
# Date 1258068535 28800
# Node ID 40daac51fc0c6ef5ac14f67b33248891bc228e15
# Parent  d7f549e03f900853cf3ae64dc5d2c3a72420690e
6655613 resync server's conditional Match block from OpenSSH (fix lint)

diff -r d7f549e03f90 -r 40daac51fc0c usr/src/cmd/ssh/libssh/common/addrmatch.c
--- a/usr/src/cmd/ssh/libssh/common/addrmatch.c	Thu Nov 12 15:48:02 2009 -0700
+++ b/usr/src/cmd/ssh/libssh/common/addrmatch.c	Thu Nov 12 15:28:55 2009 -0800
@@ -81,7 +81,9 @@
 static int
 addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa)
 {
+	/* LINTED E_BAD_PTR_CAST_ALIGN */
 	struct sockaddr_in *in4 = (struct sockaddr_in *)sa;
+	/* LINTED E_BAD_PTR_CAST_ALIGN */
 	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa;
 
 	memset(xa, '\0', sizeof(*xa));
diff -r d7f549e03f90 -r 40daac51fc0c usr/src/cmd/ssh/sshd/servconf.c
--- a/usr/src/cmd/ssh/sshd/servconf.c	Thu Nov 12 15:48:02 2009 -0700
+++ b/usr/src/cmd/ssh/sshd/servconf.c	Thu Nov 12 15:28:55 2009 -0800
@@ -660,7 +660,7 @@
 		    user ? user : "(null)", host ? host : "(null)",
 		    address ? address : "(null)");
 
-	while ((attrib = strdelim(&cp)) && *attrib != '\0') {
+	while ((attrib = strdelim(&cp)) != NULL && *attrib != '\0') {
 		if ((arg = strdelim(&cp)) == NULL || *arg == '\0') {
 			error("Missing Match criteria for %s", attrib);
 			return -1;