Merge branch 'master' into lldpmed

diff --cc src/priv.c
index 50eabaa48110678e1a16eeb07a188352516b6563,9cd99f3ede5ea26ad78f9f1ad41a913b82a953aa..0342b9db3c86a289c0f5e59e7b82b89473c9c41d
--- 1/src/priv.c
--- 2/src/priv.c
+++ b/src/priv.c
@@@ -316,10 -316,9 +316,9 @@@ asroot_ethtool(
        ifr.ifr_data = (caddr_t)&ethc;
        ethc.cmd = ETHTOOL_GSET;
        if ((rc = ioctl(sock, SIOCETHTOOL, &ifr)) != 0) {
 -              LLOG_DEBUG("[priv]: unable to ioctl ETHTOOL for %s",
 +              LLOG_DEBUG("[priv]: unable to ioctl ETHTOOL for %s: %m",
                    ifr.ifr_name);
                must_write(remote, &rc, sizeof(int));
-               close(sock);
                return;
        }
        must_write(remote, &rc, sizeof(int));