Merge branch 'master' into privsep

diff --cc configure.ac
index 69f2bc896e834a506e9763e2a331399d0f1476e5,bb25f7776b66703015e7aa34bc3875323ce5adfc..b9dd1a49ee7896f6a9e2184ca4d24d934d4c7289
--- 1/configure.ac
--- 2/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 fb82c8bae10645d1357bc3788be17786df2def4d,5a649aee3e3baacb40afa3459d5d30db49cd7a42..57aaa52713d8950b8d342bc24412db0274708f7d
--- 1/src/lldpd.c
--- 2/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>