new code on the server rc.40

[Peter Van Epp]

	FreeBSD needs this patch to elimate a redefinition warning:

Peter Van Epp / Operations and Technical Support 
Simon Fraser University, Burnaby, B.C. Canada


*** include/net/nff.h.orig	Tue Feb 27 08:17:54 2007
--- include/net/nff.h	Tue Feb 27 08:18:48 2007
***************
*** 176,182 ****
   * files of these types.
   */
  
! #if !defined(__NetBSD__)
  #define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
  #define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
  #endif
--- 176,182 ----
   * files of these types.
   */
  
! #if !defined(__NetBSD__) && !defined(__FreeBSD__)
  #define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
  #define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
  #endif