diff options
| author | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2009-11-12 15:28:55 -0800 |
|---|---|---|
| committer | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2009-11-12 15:28:55 -0800 |
| commit | 56e7e6c6e6c82bcc8d19a12a3bd8f9fd529ba5b4 (patch) | |
| tree | afe851ab77c1bc2b409878127a04afe7e1dfdb3a /usr/src | |
| parent | 7b6a044acdb057a3bcb993c4abd028d0f35595bb (diff) | |
| download | illumos-gate-56e7e6c6e6c82bcc8d19a12a3bd8f9fd529ba5b4.tar.gz | |
6655613 resync server's conditional Match block from OpenSSH (fix lint)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/addrmatch.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/sshd/servconf.c | 2 |
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; |