diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-08 11:18:55 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-08 11:18:55 +0100 |
| commit | 8877fe7359b1eef81b62c6531674aaa5a5ce6051 (patch) | |
| tree | 46cdfb0ce4c0fb1077b11d88eb02996104140a0c /mysys | |
| parent | 4d1c7b794730b101619c5dac33af71e7abcd54d2 (diff) | |
| parent | 9f9ecc0626b7ef0c54db0d43fd96e7193b907346 (diff) | |
| download | mariadb-git-8877fe7359b1eef81b62c6531674aaa5a5ce6051.tar.gz | |
merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethwaddr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index b01b109c666..74dae29f235 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -100,14 +100,14 @@ my_bool my_gethwaddr(uchar *to) uint i; for (i= 0; res && i < ifc.ifc_len / sizeof(ifr[0]); i++) { -#ifdef SIOCGIFHWADDR +#ifdef __linux__ if (ioctl(fd, SIOCGIFHWADDR, &ifr[i]) >= 0) res= memcpy_and_test(to, (uchar *)&ifr[i].ifr_hwaddr.sa_data, ETHER_ADDR_LEN); #else /* - A bug in OpenSolaris prevents non-root from getting a mac address: - http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4720634 + A bug in OpenSolaris used to prevent non-root from getting a mac address: + {no url. Oracle killed the old OpenSolaris bug database} Thus, we'll use an alternative method and extract the address from the arp table. |