From: Vincent Bernat <vbernat@wanadooportails.com>
Date: Mon, 17 Nov 2008 08:33:24 +0000 (+0100)
Subject: Merge branch 'master' into privsep
X-Git-Tag: 0.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f0cdf73561a650a6d4c7ab4815ff41dd17bd167;p=thirdparty%2Flldpd.git

Merge branch 'master' into privsep
---

6f0cdf73561a650a6d4c7ab4815ff41dd17bd167
diff --cc configure.ac
index 69f2bc89,bb25f777..b9dd1a49
--- a/configure.ac
+++ b/configure.ac
@@@ -22,26 -22,11 +22,27 @@@ AC_ARG_WITH(snmp
  )
  AM_CONDITIONAL([USE_SNMP], [test "${with_snmp}" != "no"])
  
 +AC_ARG_WITH(privsep-user,
 +	AC_HELP_STRING([--with-privsep-user],
 +		       [Which user to use for privilege separation]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_USER], "$withval", [User for privilege separation]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_USER], "_lldpd", [User for privilege separation]))
 +AC_ARG_WITH(privsep-group,
 +	AC_HELP_STRING([--with-privsep-group],
 +		       [Which group to use for privilege separation]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_GROUP], "$withval", [Group for privilege separation]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_GROUP], "_lldpd", [Group for privilege separation]))
 +AC_ARG_WITH(privsep-chroot,
 +	AC_HELP_STRING([--with-privsep-chroot],
 +		       [Which directory to use to chroot lldpd]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_CHROOT], "$withval", [Chroot directory]),
 +	AC_DEFINE_UNQUOTED([PRIVSEP_CHROOT], "/var/run/lldpd", [Chroot directory]))
 +
  # Checks for header files.
  AC_CHECK_DECLS([TAILQ_FIRST, TAILQ_NEXT, TAILQ_FOREACH, TAILQ_EMPTY],[],[],[[#include <sys/queue.h>]])
- AC_CHECK_DECL([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
- AC_CHECK_DECL([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+ AC_CHECK_DECLS([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
+ AC_CHECK_DECLS([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+ AC_CHECK_DECLS([ETHERTYPE_VLAN],[],[],[[#include <net/ethernet.h>]])
  
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
diff --cc src/lldpd.c
index fb82c8ba,5a649aee..57aaa527
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@@ -37,7 -36,9 +36,8 @@@
  #include <net/if_arp.h>
  #include <linux/filter.h>
  #include <linux/if_vlan.h>
+ #include <linux/if_packet.h>
  #include <linux/sockios.h>
 -#include <linux/ethtool.h>
  
  #ifdef USE_SNMP
  #include <net-snmp/net-snmp-config.h>