Mercurial > illumos > illumos-gate
changeset 11060:40daac51fc0c
6655613 resync server's conditional Match block from OpenSSH (fix lint)
| author | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> |
|---|---|
| date | Thu, 12 Nov 2009 15:28:55 -0800 |
| parents | d7f549e03f90 |
| children | 1e27eb9fbdd7 |
| files | usr/src/cmd/ssh/libssh/common/addrmatch.c usr/src/cmd/ssh/sshd/servconf.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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));
--- 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;