summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/ssh/libssh/common/addrmatch.c2
-rw-r--r--usr/src/cmd/ssh/sshd/servconf.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/addrmatch.c b/usr/src/cmd/ssh/libssh/common/addrmatch.c
index d39885b7bd..91aa1e7ac7 100644
--- a/usr/src/cmd/ssh/libssh/common/addrmatch.c
+++ b/usr/src/cmd/ssh/libssh/common/addrmatch.c
@@ -81,7 +81,9 @@ masklen_valid(int af, u_int masklen)
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 --git a/usr/src/cmd/ssh/sshd/servconf.c b/usr/src/cmd/ssh/sshd/servconf.c
index 983f0fb5ab..9a66f49216 100644
--- a/usr/src/cmd/ssh/sshd/servconf.c
+++ b/usr/src/cmd/ssh/sshd/servconf.c
@@ -660,7 +660,7 @@ match_cfg_line(char **condition, int line, const char *user, const char *host,
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;