diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-03-13 23:07:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-13 23:07:29 +0000 |
commit | 342585cf8e3459a7903c5db9282aa01a9f76ae42 (patch) | |
tree | 88d06dbcb1fe95c0a106cb0f169359da99c9e369 /src | |
parent | bf59a6ca1006801be18266c5f16d077720f1b8c0 (diff) | |
parent | f0f67954fe4a0d279c5a9483c6636020863de75a (diff) | |
parent | e08c47cf1ee92381d7cc43a16db44d4f25fe74f8 (diff) | |
download | nix-342585cf8e3459a7903c5db9282aa01a9f76ae42.zip |
Merge #1675 #1676
1675: Fix a panic in Linkaddr::addr r=rtzoeller a=asomers
The function assumed something about the values of the sockaddr_dl's
fields. But because the inner type is public, we musn't do that. The
only solution is to change the function's signature to return an Option.
1676: Fix the build on DragonflyBSD with -Zminimal-versions r=asomers a=asomers
Co-authored-by: Alan Somers <asomers@gmail.com>