Date: Mon, 12 Jun 2017 00:24:58 -0700 From: Xin Li <delphij@delphij.net> To: David Wolfskill <david@catwhisker.org>, Konstantin Belousov <kostikbel@gmail.com>, stable@freebsd.org Cc: d@delphij.net Subject: Re: post ino64: lockd no runs? Message-ID: <85c966e1-f719-5d4a-d6c3-b0da7c0f6dda@delphij.net> In-Reply-To: <20170611205124.GD1284@albert.catwhisker.org> References: <24b27f3e-f91b-553d-f2c1-e876608e0baf@protected-networks.net> <20170611172022.GA3184@albert.catwhisker.org> <20170611185830.GS2088@kib.kiev.ua> <20170611205124.GD1284@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jGpQtonmPe0GU9d6rCTbficmv8sTQk3FT Content-Type: multipart/mixed; boundary="wSuAt2EHsAUle86xemt1CPfnnUhf6NgCE"; protected-headers="v1" From: Xin Li <delphij@delphij.net> To: David Wolfskill <david@catwhisker.org>, Konstantin Belousov <kostikbel@gmail.com>, stable@freebsd.org Cc: d@delphij.net Message-ID: <85c966e1-f719-5d4a-d6c3-b0da7c0f6dda@delphij.net> Subject: Re: post ino64: lockd no runs? References: <24b27f3e-f91b-553d-f2c1-e876608e0baf@protected-networks.net> <20170611172022.GA3184@albert.catwhisker.org> <20170611185830.GS2088@kib.kiev.ua> <20170611205124.GD1284@albert.catwhisker.org> In-Reply-To: <20170611205124.GD1284@albert.catwhisker.org> --wSuAt2EHsAUle86xemt1CPfnnUhf6NgCE Content-Type: multipart/mixed; boundary="------------A4444EA85EE961FFE6C1B005" Content-Language: en-US This is a multi-part message in MIME format. --------------A4444EA85EE961FFE6C1B005 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Thanks for Kostantin's hints, this is indeed related to my change (which exposed an old bug with rpc.lockd). Please try attached fix. Cheers, --------------A4444EA85EE961FFE6C1B005 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="rpc.lockd.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="rpc.lockd.diff" Index: usr.sbin/rpc.lockd/lockd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- usr.sbin/rpc.lockd/lockd.c (revision 319826) +++ usr.sbin/rpc.lockd/lockd.c (working copy) @@ -902,8 +902,7 @@ lookup_addresses(struct netconfig *nconf) sin->sin_port =3D htons(0); sin->sin_addr.s_addr =3D htonl(INADDR_ANY); res->ai_addr =3D (struct sockaddr*) sin; - res->ai_addrlen =3D (socklen_t) - sizeof(res->ai_addr); + res->ai_addrlen =3D sizeof(struct sockaddr_in); break; case AF_INET6: sin6 =3D malloc(sizeof(struct sockaddr_in6)); @@ -913,7 +912,7 @@ lookup_addresses(struct netconfig *nconf) sin6->sin6_port =3D htons(0); sin6->sin6_addr =3D in6addr_any; res->ai_addr =3D (struct sockaddr*) sin6; - res->ai_addrlen =3D (socklen_t) sizeof(res->ai_addr); + res->ai_addrlen =3D sizeof(struct sockaddr_in6); break; default: break; @@ -938,7 +937,7 @@ lookup_addresses(struct netconfig *nconf) } } =20 - servaddr.len =3D servaddr.maxlen =3D res->ai_addr->sa_len; + servaddr.len =3D servaddr.maxlen =3D res->ai_addrlen; servaddr.buf =3D res->ai_addr; uaddr =3D taddr2uaddr(nconf, &servaddr); =20 --------------A4444EA85EE961FFE6C1B005-- --wSuAt2EHsAUle86xemt1CPfnnUhf6NgCE-- --jGpQtonmPe0GU9d6rCTbficmv8sTQk3FT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJZPkHNAAoJEJW2GBstM+nsDmEP/21BPug6gITEQlldTB853dMf fwicA//qmON2KOebrISlqnP+ZbOv8qkbf4hL39wB8a6XUORf3Efz9sVUr7b/7yS1 OhHjkzsNzTNm+ZjM2D5YqgYslTsx9Gwi8s7l6JVjr55aWMKbhEk0bobSEceqfaIr 5p7WOOPxn97ZCmuocLR6U0luD5g6zXY9wyUbDuxmgpwfVo9A6yuTlhMnZTlzQMN4 QWTc6783R7E8em18kHH8LhfG2b/9lchLCM0QZe/DS/bDd3Pa++DtPEILEnLrzYfy VfcGyp99e/Rc/KidkLN3RZ0NYj7yWtNmxGtGstBSAdUj5WntAtMc0e3TyNyi+e68 gWdJUnxANexW/T4PowPKhzkMEl1o7EwXEoqfPBNr71Y4pVBsY5fu83nETnNZpyGy ap+6E8mPJ8acxncxMe6JCKre7nqAvNuYRkAPBAmh9itXb7iYIQpWeE6pj0yY4Uqx WtBBjPNyeIIEWOQ21dqfI6ay4qafWU8vLDGuKaS4PNdS3tRcBu/72GA4Pdd1wwxJ IfLzwnr9H47kRSn3zc3FnujY0E1us1okKtRnxMs/fAkvz5caIzBGojv7q+xTBZjA 3QLuJMNH/zIP+6laCHH4srBtd99ZTTRU+NEAK8iOTGjG6ceLNJIRZVEk89zemflP VREaW7ye97dhkwU1Vqn7 =DMs9 -----END PGP SIGNATURE----- --jGpQtonmPe0GU9d6rCTbficmv8sTQk3FT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?85c966e1-f719-5d4a-d6c3-b0da7c0f6dda>