From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 7 Dec 2008 15:30:18 +0000 (+0100)
Subject: Merge branch 'master' into lldpmed
X-Git-Tag: 0.3~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd6f5ab775600b10a7ac503f7e31d158fdd61ba2;p=thirdparty%2Flldpd.git

Merge branch 'master' into lldpmed
---

fd6f5ab775600b10a7ac503f7e31d158fdd61ba2
diff --cc src/priv.c
index 50eabaa4,9cd99f3e..0342b9db
--- a/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));